Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gradle-changes' into 'master'

Browse Source 
Lint updates, update ACRA

This might fix #677, although hard to tell since I cannot reproduce the issue.

See merge request !343
This commit is contained in:
Daniel Martí 2016-06-22 10:30:51 +00:00
commit 95d8537187
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/build.gradle
View File

@ -32,7 +32,7 @@ dependencies {
compile 'commons-io:commons-io:2.5' compile 'commons-io:commons-io:2.5'
compile 'commons-net:commons-net:3.5' compile 'commons-net:commons-net:3.5'
compile 'org.openhab.jmdns:jmdns:3.4.2' 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-v4'
exclude module: 'support-annotations' exclude module: 'support-annotations'
} }
@ -98,7 +98,7 @@ if (!hasProperty('sourceDeps')) {
'com.madgag.spongycastle:pkix:6aba9b2210907a3d46dd3dcac782bb3424185290468d102d5207ebdc9796a905', 'com.madgag.spongycastle:pkix:6aba9b2210907a3d46dd3dcac782bb3424185290468d102d5207ebdc9796a905',
'com.madgag.spongycastle:prov:029f26cd6b67c06ffa05702d426d472c141789001bcb15b7262ed86c868e5643', 'com.madgag.spongycastle:prov:029f26cd6b67c06ffa05702d426d472c141789001bcb15b7262ed86c868e5643',
'com.madgag.spongycastle:core:9b6b7ac856b91bcda2ede694eccd26cefb0bf0b09b89f13cda05b5da5ff68c6b', 'com.madgag.spongycastle:core:9b6b7ac856b91bcda2ede694eccd26cefb0bf0b09b89f13cda05b5da5ff68c6b',
'ch.acra:acra:afd5b28934d5166b55f261c85685ad59e8a4ebe9ca1960906afaa8c76d8dc9eb', 'ch.acra:acra:98e71bd00a713b9f848abbae4874601533aaf8492bf9b508e14d07f844a53839',
'io.reactivex:rxjava:2c162afd78eba217cdfee78b60e85d3bfb667db61e12bc95e3cf2ddc5beeadf6', 'io.reactivex:rxjava:2c162afd78eba217cdfee78b60e85d3bfb667db61e12bc95e3cf2ddc5beeadf6',
'io.reactivex:rxandroid:35c1a90f8c1f499db3c1f3d608e1f191ac8afddb10c02dd91ef04c03a0a4bcda', 'io.reactivex:rxandroid:35c1a90f8c1f499db3c1f3d608e1f191ac8afddb10c02dd91ef04c03a0a4bcda',
] ]
@ -194,15 +194,8 @@ android {
// Our translations are crowd-sourced // Our translations are crowd-sourced
disable 'MissingTranslation' 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 // to make CI fail on errors until this is fixed https://github.com/rtyley/spongycastle/issues/7
disable 'InvalidPackage' warning 'InvalidPackage'
} }
packagingOptions { packagingOptions {

4
app/src/main/java/org/fdroid/fdroid/CrashReportActivity.java
View File

@ -13,8 +13,8 @@ public class CrashReportActivity extends BaseCrashReportDialog implements Dialog
private EditText comment; private EditText comment;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void init(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.init(savedInstanceState);
final AlertDialog dialog = new AlertDialog.Builder(this) final AlertDialog dialog = new AlertDialog.Builder(this)
.setTitle(R.string.crash_dialog_title) .setTitle(R.string.crash_dialog_title)