From f4d627e81555b586af5432cd88648231dbdd84f5 Mon Sep 17 00:00:00 2001 From: Vavassor Date: Sun, 16 Jul 2017 18:26:56 -0400 Subject: [PATCH] Release 1.1.4-beta.6 --- app/build.gradle | 11 ++++++----- app/proguard-rules.pro | 3 ++- .../com/keylesspalace/tusky/TuskyApplication.java | 12 +++++++++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f6eeb14fc..f5b59ab16 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,17 @@ apply plugin: 'com.android.application' android { + signingConfigs { + + } compileSdkVersion 25 buildToolsVersion "25.0.3" defaultConfig { applicationId "com.keylesspalace.tusky" minSdkVersion 15 targetSdkVersion 25 - versionCode 21 - versionName "1.1.4-beta.5" + versionCode 22 + versionName "1.1.4-beta.6" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary true } @@ -59,11 +62,9 @@ dependencies { } compile 'org.bouncycastle:bcprov-jdk15on:1.57' testCompile 'junit:junit:4.12' - //room - compile "android.arch.persistence.room:runtime:1.0.0-alpha3" + compile 'android.arch.persistence.room:runtime:1.0.0-alpha3' annotationProcessor "android.arch.persistence.room:compiler:1.0.0-alpha3" - googleCompile 'com.google.firebase:firebase-crash:10.0.1' } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f59f1c04a..1a356c67f 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -59,4 +59,5 @@ public *; } # for bouncycastle --dontwarn org.bouncycastle.** +-keep class org.bouncycastle.jce.provider.** +-dontwarn javax.naming.** diff --git a/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.java b/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.java index 1aacd0e8f..d666ad62f 100644 --- a/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.java +++ b/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.java @@ -65,7 +65,9 @@ public class TuskyApplication extends Application { Provider existingProvider = Security.getProvider(providerName); if (existingProvider == null) { try { - Security.addProvider(new BouncyCastleProvider()); + int priority = Security.addProvider(new BouncyCastleProvider()); + Log.i(TAG, String.format("BouncyCastleProvider was added with priority %d.", + priority)); } catch (SecurityException e) { Log.e(TAG, "Permission to add the security provider was denied."); } @@ -82,13 +84,17 @@ public class TuskyApplication extends Application { try { Security.removeProvider(providerName); Security.insertProviderAt(replacement, priority); + Log.i(TAG, String.format( + "BouncyCastleProvider version %f was updated to version %f.", + existingProvider.getVersion(), replacement.getVersion())); } catch (SecurityException e) { Log.e(TAG, "Permission to update a security provider was denied."); } } } - db = Room.databaseBuilder(getApplicationContext(), - AppDatabase.class, "tuskyDB").allowMainThreadQueries().build(); + db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "tuskyDB") + .allowMainThreadQueries() + .build(); } } \ No newline at end of file