jenkins-bot has submitted this change and it was merged. Change subject: Upgrade to HockeyApp v3.7.0 ......................................................................
Upgrade to HockeyApp v3.7.0 Upgrade HockeyApp to v3.7.0[0]. Also, rename the activity_login.xml layout file to work around a resource conflict in the new aar[1]. This patch was tested for crash logging, crash report preference, remote logging, and locale changes on the production release build variant. [0] https://github.com/bitstadium/HockeySDK-Android/releases/3.7.0 [1] https://github.com/bitstadium/HockeySDK-Android/issues/121 Bug: T123579 Change-Id: Ia73343357adbea92480dace7a2a5c9a6f16093ff --- M app/build.gradle M app/proguard-rules.pro M app/src/main/AndroidManifest.xml M app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java M app/src/main/java/org/wikipedia/login/LoginActivity.java R app/src/main/res/layout/activity_wiki_login.xml 6 files changed, 4 insertions(+), 32 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/build.gradle b/app/build.gradle index a265a41..d135c62 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -178,7 +178,7 @@ compile('com.mapbox.mapboxsdk:mapbox-android-sdk:2.3.0@aar') { transitive = true } - compile 'net.hockeyapp.android:HockeySDK:3.6.2' + compile 'net.hockeyapp.android:HockeySDK:3.7.0' testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:1.9.5' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8a29c7b..9646917 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -51,33 +51,6 @@ -keep class sun.misc.Unsafe { *; } # --- /Gson --- -# --- HockeyApp --- -# http://support.hockeyapp.net/kb/client-integration-android/hockeyapp-and-proguard - -# Restore source file names and restore approximate line numbers in the stack traces, -# otherwise the stack traces are pretty useless. --keepattributes SourceFile,LineNumberTable - --keep public class javax.net.ssl.** --keepclassmembers public class javax.net.ssl.** { - *; -} - --keep public class org.apache.http.** --keepclassmembers public class org.apache.http.** { - *; -} - --keepclassmembers class net.hockeyapp.android.UpdateFragment { - *; -} - -# This is undocumented but seems to work. --dontwarn uk.co.senab.photoview.** --keep class net.hockeyapp.** { <init>(...); *; } --keep enum net.hockeyapp.** { <init>(...); *; } -# --- /HockeyApp --- - # --- Mapbox --- # TODO: remove when upstream patch is merged: https://phabricator.wikimedia.org/T120388 -keep class com.mapbox.mapboxsdk.views.** { *; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ad5a8f2..efec31a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -42,7 +42,8 @@ Set "value" to "Google Play" for Google Play Store. --> <meta-data android:name="@string/preference_key_app_channel" android:value="@string/channel" /> - <!-- Don't delete the meta-data field above --> + <meta-data android:name="net.hockeyapp.android.appIdentifier" + android:value="@string/hockeyapp_app_id" /> <activity android:name=".page.PageActivity" android:theme="@style/PageTheme" 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 a875dd4..4a22545 100644 --- a/app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java +++ b/app/src/main/java/org/wikipedia/crash/hockeyapp/HockeyAppCrashReporter.java @@ -7,7 +7,6 @@ import net.hockeyapp.android.CrashManager; import net.hockeyapp.android.ExceptionHandler; -import net.hockeyapp.android.LocaleManager; import org.wikipedia.WikipediaApp; import org.wikipedia.crash.BaseCrashReporter; @@ -38,7 +37,6 @@ @Override public void checkCrashes(@NonNull Activity activity) { L.v("Checking for HockeyApp crashes."); - LocaleManager.initialize(activity.getApplicationContext()); CrashManager.register(activity, appId, crashListener); } diff --git a/app/src/main/java/org/wikipedia/login/LoginActivity.java b/app/src/main/java/org/wikipedia/login/LoginActivity.java index c7d7cd6..6b3e853 100644 --- a/app/src/main/java/org/wikipedia/login/LoginActivity.java +++ b/app/src/main/java/org/wikipedia/login/LoginActivity.java @@ -63,7 +63,7 @@ super.onCreate(savedInstanceState); app = (WikipediaApp)getApplicationContext(); - setContentView(R.layout.activity_login); + setContentView(R.layout.activity_wiki_login); usernameText = (EditText) findViewById(R.id.login_username_text); passwordText = ((PasswordTextInput) findViewById(R.id.login_password_input)).getEditText(); diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_wiki_login.xml similarity index 100% rename from app/src/main/res/layout/activity_login.xml rename to app/src/main/res/layout/activity_wiki_login.xml -- To view, visit https://gerrit.wikimedia.org/r/264255 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia73343357adbea92480dace7a2a5c9a6f16093ff Gerrit-PatchSet: 3 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski <[email protected]> Gerrit-Reviewer: BearND <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Dbrant <[email protected]> Gerrit-Reviewer: Mholloway <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
