From 26f5286f97d53d2b30359234546eedc7d033e131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 21 Jun 2016 13:26:56 +0100 Subject: [PATCH 1/2] lint: don't unnecessarily disable warnings Those that are sometimes false positives but could still point out valid issues should be warnings, not disabled entirely. The first two are warnings already, the third is an error. --- app/build.gradle | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 63535c85d..9bb52526f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -194,15 +194,8 @@ android { // Our translations are crowd-sourced disable 'MissingTranslation' - // We have locale folders like "values-he" and "values-id" as symlinks - // since some devices ship deprecated locale codes - disable 'LocaleFolder' - - // Like supportsRtl or parentActivityName. They are on purpose. - disable 'UnusedAttribute' - // to make CI fail on errors until this is fixed https://github.com/rtyley/spongycastle/issues/7 - disable 'InvalidPackage' + warning 'InvalidPackage' } packagingOptions { From cd1f59fb29d9578e593ecc3d98ffda715570e3f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 21 Jun 2016 13:35:29 +0100 Subject: [PATCH 2/2] Bump ACRA to 4.9.0 Also change the overrides from onCreate to init as suggested in the changelog: https://github.com/ACRA/acra/wiki/ChangeLog#acra-490-rc-1-2-may-2016 The behaviour should be very similar, although overriding the wrong method (which we were doing) could cause all sorts of weird issues. --- app/build.gradle | 4 ++-- app/src/main/java/org/fdroid/fdroid/CrashReportActivity.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9bb52526f..7c73e3d06 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,7 +32,7 @@ dependencies { compile 'commons-io:commons-io:2.5' compile 'commons-net:commons-net:3.5' compile 'org.openhab.jmdns:jmdns:3.4.2' - compile('ch.acra:acra:4.8.5') { + compile('ch.acra:acra:4.9.0') { exclude module: 'support-v4' exclude module: 'support-annotations' } @@ -98,7 +98,7 @@ if (!hasProperty('sourceDeps')) { 'com.madgag.spongycastle:pkix:6aba9b2210907a3d46dd3dcac782bb3424185290468d102d5207ebdc9796a905', 'com.madgag.spongycastle:prov:029f26cd6b67c06ffa05702d426d472c141789001bcb15b7262ed86c868e5643', 'com.madgag.spongycastle:core:9b6b7ac856b91bcda2ede694eccd26cefb0bf0b09b89f13cda05b5da5ff68c6b', - 'ch.acra:acra:afd5b28934d5166b55f261c85685ad59e8a4ebe9ca1960906afaa8c76d8dc9eb', + 'ch.acra:acra:98e71bd00a713b9f848abbae4874601533aaf8492bf9b508e14d07f844a53839', 'io.reactivex:rxjava:2c162afd78eba217cdfee78b60e85d3bfb667db61e12bc95e3cf2ddc5beeadf6', 'io.reactivex:rxandroid:35c1a90f8c1f499db3c1f3d608e1f191ac8afddb10c02dd91ef04c03a0a4bcda', ] diff --git a/app/src/main/java/org/fdroid/fdroid/CrashReportActivity.java b/app/src/main/java/org/fdroid/fdroid/CrashReportActivity.java index 47dff3bd9..86875b4a2 100644 --- a/app/src/main/java/org/fdroid/fdroid/CrashReportActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/CrashReportActivity.java @@ -13,8 +13,8 @@ public class CrashReportActivity extends BaseCrashReportDialog implements Dialog private EditText comment; @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + protected void init(Bundle savedInstanceState) { + super.init(savedInstanceState); final AlertDialog dialog = new AlertDialog.Builder(this) .setTitle(R.string.crash_dialog_title)