From f0760ec6ab5f62184fbfb1a8640ac03bb0bbc6cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sat, 25 May 2019 10:01:01 -0400
Subject: [PATCH] proguard: preserve ezvcard properties
Change-Id: I6467b6f50b36ec4e6f3f2b46e1c594d2ad66e847
---
ring-android/app/build.gradle | 4 ++--
ring-android/app/proguard-rules.pro | 4 +++-
.../src/main/java/cx/ring/utils/VCardUtils.java | 6 +++---
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ring-android/app/build.gradle b/ring-android/app/build.gradle
index 262dea94c..99703e848 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 fdb94a288..4f78caef4 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 88328815a..0449bda0c 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;
}
--
GitLab