Skip to content
Snippets Groups Projects
Commit f0760ec6 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

proguard: preserve ezvcard properties

Change-Id: I6467b6f50b36ec4e6f3f2b46e1c594d2ad66e847
parent f2c76ed5
No related branches found
No related tags found
No related merge requests found
...@@ -8,8 +8,8 @@ android { ...@@ -8,8 +8,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
versionCode 163 versionCode 164
versionName "20190525-5" versionName "20190525-6"
} }
sourceSets { sourceSets {
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
-keepattributes Signature -keepattributes Signature
-keep class android.support.v7.widget.LinearLayoutManager { *; } -keep class android.support.v7.widget.LinearLayoutManager { *; }
-keep,includedescriptorclasses class androidx.core.content.FileProvider { *; }
-keep,includedescriptorclasses class cx.ring.** { *; } -keep,includedescriptorclasses class cx.ring.** { *; }
-keepclassmembers class cx.ring.** { *; } -keepclassmembers class cx.ring.** { *; }
...@@ -35,13 +36,14 @@ ...@@ -35,13 +36,14 @@
-dontwarn freemarker.** -dontwarn freemarker.**
# EZVcard # EZVcard
-dontwarn ezvcard.io.json.JCardModule -dontwarn ezvcard.io.json.**
-keep,includedescriptorclasses class ezvcard.io.json.JCardModule { *; } -keep,includedescriptorclasses class ezvcard.io.json.JCardModule { *; }
-keepclassmembers class ezvcard.io.json.JCardModule { *; } -keepclassmembers class ezvcard.io.json.JCardModule { *; }
-keep,includedescriptorclasses enum ezvcard.io.json.JCardModule { *; } -keep,includedescriptorclasses enum ezvcard.io.json.JCardModule { *; }
-keepclassmembers enum ezvcard.io.json.JCardModule { *; } -keepclassmembers enum ezvcard.io.json.JCardModule { *; }
-keep,includedescriptorclasses interface ezvcard.io.json.JCardModule { *; } -keep,includedescriptorclasses interface ezvcard.io.json.JCardModule { *; }
-keepclassmembers interface ezvcard.io.json.JCardModule { *; } -keepclassmembers interface ezvcard.io.json.JCardModule { *; }
-keep class ezvcard.property.** { *; }
# barcodescanner # barcodescanner
-keep,includedescriptorclasses class com.journeyapps.barcodescanner.** { *; } -keep,includedescriptorclasses class com.journeyapps.barcodescanner.** { *; }
......
...@@ -161,14 +161,14 @@ public final class VCardUtils { ...@@ -161,14 +161,14 @@ public final class VCardUtils {
*/ */
private static VCard loadFromDisk(String path) { private static VCard loadFromDisk(String path) {
try { try {
if (StringUtils.isEmpty(path)) { if (path == null || path.isEmpty()) {
// Log.d(TAG, "Empty file or error with the context"); Log.d(TAG, "Empty file or error with the context");
return null; return null;
} }
File vcardPath = new File(path); File vcardPath = new File(path);
if (!vcardPath.exists()) { if (!vcardPath.exists()) {
// Log.d(TAG, "vcardPath not exist " + vcardPath); Log.d(TAG, "vcardPath not exist " + vcardPath);
return null; return null;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment