Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Weblate 2018-03-12 17:00:19 +01:00
commit 10fb763d66
2 changed files with 6 additions and 4 deletions

View file

@ -55,7 +55,7 @@ dependencies {
exclude module: 'support-annotations' exclude module: 'support-annotations'
} }
implementation 'com.github.TeamNewPipe:NewPipeExtractor:b1130629bb' implementation 'com.github.TeamNewPipe:NewPipeExtractor:fce324d1bc74bc'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:1.10.19' testImplementation 'org.mockito:mockito-core:1.10.19'

View file

@ -176,9 +176,11 @@ public class MainActivity extends AppCompatActivity {
// when the user returns to MainActivity // when the user returns to MainActivity
drawer.closeDrawer(Gravity.START, false); drawer.closeDrawer(Gravity.START, false);
try { try {
String selectedServiceName = NewPipe.getService( if(BuildConfig.BUILD_TYPE != "release" ) {
ServiceHelper.getSelectedServiceId(this)).getServiceInfo().getName(); String selectedServiceName = NewPipe.getService(
headerServiceView.setText(selectedServiceName); ServiceHelper.getSelectedServiceId(this)).getServiceInfo().getName();
headerServiceView.setText(selectedServiceName);
}
} catch (Exception e) { } catch (Exception e) {
ErrorActivity.reportUiError(this, e); ErrorActivity.reportUiError(this, e);
} }