Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Release 1.1.4-beta.6

This commit is contained in:
Vavassor 2017-07-16 18:26:56 -04:00
parent 6e67db7631
commit f4d627e815
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/build.gradle
View File

@ -1,14 +1,17 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
signingConfigs {
}
compileSdkVersion 25 compileSdkVersion 25
buildToolsVersion "25.0.3" buildToolsVersion "25.0.3"
defaultConfig { defaultConfig {
applicationId "com.keylesspalace.tusky" applicationId "com.keylesspalace.tusky"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 25 targetSdkVersion 25
versionCode 21 versionCode 22
versionName "1.1.4-beta.5" versionName "1.1.4-beta.6"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary true vectorDrawables.useSupportLibrary true
} }
@ -59,11 +62,9 @@ dependencies {
} }
compile 'org.bouncycastle:bcprov-jdk15on:1.57' compile 'org.bouncycastle:bcprov-jdk15on:1.57'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
//room //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" annotationProcessor "android.arch.persistence.room:compiler:1.0.0-alpha3"
googleCompile 'com.google.firebase:firebase-crash:10.0.1' googleCompile 'com.google.firebase:firebase-crash:10.0.1'
} }

3
app/proguard-rules.pro vendored
View File

@ -59,4 +59,5 @@ public *;
} }
# for bouncycastle # for bouncycastle
-dontwarn org.bouncycastle.** -keep class org.bouncycastle.jce.provider.**
-dontwarn javax.naming.**

12
app/src/main/java/com/keylesspalace/tusky/TuskyApplication.java
View File

@ -65,7 +65,9 @@ public class TuskyApplication extends Application {
Provider existingProvider = Security.getProvider(providerName); Provider existingProvider = Security.getProvider(providerName);
if (existingProvider == null) { if (existingProvider == null) {
try { 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) { } catch (SecurityException e) {
Log.e(TAG, "Permission to add the security provider was denied."); Log.e(TAG, "Permission to add the security provider was denied.");
} }
@ -82,13 +84,17 @@ public class TuskyApplication extends Application {
try { try {
Security.removeProvider(providerName); Security.removeProvider(providerName);
Security.insertProviderAt(replacement, priority); Security.insertProviderAt(replacement, priority);
Log.i(TAG, String.format(
"BouncyCastleProvider version %f was updated to version %f.",
existingProvider.getVersion(), replacement.getVersion()));
} catch (SecurityException e) { } catch (SecurityException e) {
Log.e(TAG, "Permission to update a security provider was denied."); Log.e(TAG, "Permission to update a security provider was denied.");
} }
} }
} }
db = Room.databaseBuilder(getApplicationContext(), db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "tuskyDB")
AppDatabase.class, "tuskyDB").allowMainThreadQueries().build(); .allowMainThreadQueries()
.build();
} }
} }