Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/315967
Change subject: Check crashes app-wide, instead of per-activity. ...................................................................... Check crashes app-wide, instead of per-activity. This registers the HockeyApp crash handler when the app is first created, removing the need to register for crashes from each Activity. This will ensure that the crash handler is invoked from any point in the app, not just a specific activity. Also, I don't believe we were actually making use of MetricsManager, so no longer registering for that, either. Change-Id: If850d3a8d9b87290280073c00d71363b3ff28c5a --- M app/src/main/java/org/wikipedia/WikipediaApp.java M app/src/main/java/org/wikipedia/crash/CrashReportActivity.java M app/src/main/java/org/wikipedia/crash/CrashReporter.java M app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java M app/src/main/java/org/wikipedia/page/PageActivity.java M app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java 6 files changed, 1 insertion(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/67/315967/1 diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java b/app/src/main/java/org/wikipedia/WikipediaApp.java index 482edbf..376a156 100644 --- a/app/src/main/java/org/wikipedia/WikipediaApp.java +++ b/app/src/main/java/org/wikipedia/WikipediaApp.java @@ -1,7 +1,6 @@ package org.wikipedia; import android.annotation.TargetApi; -import android.app.Activity; import android.app.Application; import android.database.ContentObserver; import android.net.Uri; @@ -478,12 +477,6 @@ } } - public void checkCrashes(@NonNull Activity activity) { - if (!isPreBetaRelease()) { - crashReporter.checkCrashes(activity); - } - } - public void runOnMainThread(Runnable runnable) { new Handler(getMainLooper()).post(runnable); } @@ -546,7 +539,6 @@ private void initExceptionHandling() { crashReporter = new HockeyAppCrashReporter(getString(R.string.hockeyapp_app_id), consentAccessor()); crashReporter.registerCrashHandler(this); - L.setRemoteLogger(crashReporter); } diff --git a/app/src/main/java/org/wikipedia/crash/CrashReportActivity.java b/app/src/main/java/org/wikipedia/crash/CrashReportActivity.java index e3a27ff..d6beca4 100644 --- a/app/src/main/java/org/wikipedia/crash/CrashReportActivity.java +++ b/app/src/main/java/org/wikipedia/crash/CrashReportActivity.java @@ -1,9 +1,7 @@ package org.wikipedia.crash; import android.content.Intent; -import android.os.Bundle; -import org.wikipedia.WikipediaApp; import org.wikipedia.activity.ActivityUtil; import org.wikipedia.activity.SingleFragmentActivity; @@ -12,12 +10,6 @@ @Override protected CrashReportFragment createFragment() { return CrashReportFragment.newInstance(); - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - WikipediaApp.getInstance().checkCrashes(this); } @Override diff --git a/app/src/main/java/org/wikipedia/crash/CrashReporter.java b/app/src/main/java/org/wikipedia/crash/CrashReporter.java index fc94b20..382bd3c 100644 --- a/app/src/main/java/org/wikipedia/crash/CrashReporter.java +++ b/app/src/main/java/org/wikipedia/crash/CrashReporter.java @@ -1,6 +1,5 @@ package org.wikipedia.crash; -import android.app.Activity; import android.content.Context; import android.support.annotation.NonNull; @@ -13,5 +12,4 @@ CrashReporter putReportProperty(String key, String value); void registerCrashHandler(@NonNull Context context); - void checkCrashes(@NonNull Activity activity); } \ No newline at end of file diff --git a/app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java b/app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java index 36301d5..3c9ef5f 100644 --- a/app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java +++ b/app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java @@ -1,6 +1,5 @@ package org.wikipedia.crash.hockeyapp; -import android.app.Activity; import android.content.Context; import android.content.Intent; import android.support.annotation.NonNull; @@ -32,13 +31,7 @@ L.v("Registering for HockeyApp crash handling."); HockeyAppExceptionHandler handler = new HockeyAppExceptionHandler(crashListener, true); handler.install(); - CrashManager.initialize(context, appId, crashListener); - } - - @Override - public void checkCrashes(@NonNull Activity activity) { - L.v("Checking for HockeyApp crashes."); - CrashManager.register(activity, appId, crashListener); + CrashManager.register(context, appId, crashListener); } @Override diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java b/app/src/main/java/org/wikipedia/page/PageActivity.java index b235985..10e341e 100644 --- a/app/src/main/java/org/wikipedia/page/PageActivity.java +++ b/app/src/main/java/org/wikipedia/page/PageActivity.java @@ -36,8 +36,6 @@ import com.squareup.otto.Bus; import com.squareup.otto.Subscribe; -import net.hockeyapp.android.metrics.MetricsManager; - import org.apache.commons.lang3.StringUtils; import org.wikipedia.Constants; import org.wikipedia.R; @@ -130,8 +128,6 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); app = (WikipediaApp) getApplicationContext(); - MetricsManager.register(app, app); - app.checkCrashes(this); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, diff --git a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java index b82bd25..1a62817 100644 --- a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java +++ b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java @@ -8,7 +8,6 @@ import android.support.v7.preference.TwoStatePreference; import org.wikipedia.R; -import org.wikipedia.WikipediaApp; import org.wikipedia.crash.RemoteLogException; import org.wikipedia.useroption.ui.UserOptionRowActivity; import org.wikipedia.util.log.L; @@ -122,7 +121,6 @@ @Override public boolean onPreferenceChange(Preference preference, Object newValue) { L.logRemoteError(new RemoteLogException(newValue.toString())); - WikipediaApp.getInstance().checkCrashes(getActivity()); return true; } }; -- To view, visit https://gerrit.wikimedia.org/r/315967 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If850d3a8d9b87290280073c00d71363b3ff28c5a Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <dbr...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits