Merge branch '954_dont_show_on_startup_failure' into 'master'

Don't show screenfilter warning in StartupFailureActivity

See merge request !539
This commit is contained in:
akwizgran
2017-05-29 09:05:18 +00:00

View File

@@ -26,6 +26,11 @@ public class StartupFailureActivity extends BaseActivity {
}
@Override
protected void showNewScreenFilterWarning() {
// Don't show here, service might not be available
}
private void handleIntent(Intent i) {
StartResult result = (StartResult) i.getSerializableExtra("briar.START_RESULT");
int notificationId = i.getIntExtra("briar.FAILURE_NOTIFICATION_ID", -1);