diff --git a/ring-android/app/build.gradle b/ring-android/app/build.gradle index 262dea94c2a8d9a88917bba60aff71bc890886be..99703e84806dae7cee18bea73e59336550c97207 100644 --- a/ring-android/app/build.gradle +++ b/ring-android/app/build.gradle @@ -8,8 +8,8 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 28 - versionCode 163 - versionName "20190525-5" + versionCode 164 + versionName "20190525-6" } sourceSets { diff --git a/ring-android/app/proguard-rules.pro b/ring-android/app/proguard-rules.pro index fdb94a2888dcd1990048aab7ad89904ad17a8804..4f78caef44b86298de1d6169e36324fe8eefc120 100644 --- a/ring-android/app/proguard-rules.pro +++ b/ring-android/app/proguard-rules.pro @@ -5,6 +5,7 @@ -keepattributes Signature -keep class android.support.v7.widget.LinearLayoutManager { *; } +-keep,includedescriptorclasses class androidx.core.content.FileProvider { *; } -keep,includedescriptorclasses class cx.ring.** { *; } -keepclassmembers class cx.ring.** { *; } @@ -35,13 +36,14 @@ -dontwarn freemarker.** # EZVcard --dontwarn ezvcard.io.json.JCardModule +-dontwarn ezvcard.io.json.** -keep,includedescriptorclasses class ezvcard.io.json.JCardModule { *; } -keepclassmembers class ezvcard.io.json.JCardModule { *; } -keep,includedescriptorclasses enum ezvcard.io.json.JCardModule { *; } -keepclassmembers enum ezvcard.io.json.JCardModule { *; } -keep,includedescriptorclasses interface ezvcard.io.json.JCardModule { *; } -keepclassmembers interface ezvcard.io.json.JCardModule { *; } +-keep class ezvcard.property.** { *; } # barcodescanner -keep,includedescriptorclasses class com.journeyapps.barcodescanner.** { *; } diff --git a/ring-android/libringclient/src/main/java/cx/ring/utils/VCardUtils.java b/ring-android/libringclient/src/main/java/cx/ring/utils/VCardUtils.java index 88328815aa027e24f1a1423ed63b54d2c50cf2eb..0449bda0c0e9064feed1a36f0e3e09c55747857a 100644 --- a/ring-android/libringclient/src/main/java/cx/ring/utils/VCardUtils.java +++ b/ring-android/libringclient/src/main/java/cx/ring/utils/VCardUtils.java @@ -161,14 +161,14 @@ public final class VCardUtils { */ private static VCard loadFromDisk(String path) { try { - if (StringUtils.isEmpty(path)) { - // Log.d(TAG, "Empty file or error with the context"); + if (path == null || path.isEmpty()) { + Log.d(TAG, "Empty file or error with the context"); return null; } File vcardPath = new File(path); if (!vcardPath.exists()) { - // Log.d(TAG, "vcardPath not exist " + vcardPath); + Log.d(TAG, "vcardPath not exist " + vcardPath); return null; }