From cb4d4a8b470c986eaf50b1e795d3d69643756f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 2 Jan 2018 18:19:36 +0100 Subject: [PATCH] Extend proguard rules --- OpenKeychain/proguard-rules-base.pro | 5 ----- OpenKeychain/proguard-rules-okio.pro | 1 + OpenKeychain/proguard-rules-support.pro | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenKeychain/proguard-rules-base.pro b/OpenKeychain/proguard-rules-base.pro index 72cf893ae..977308e4e 100644 --- a/OpenKeychain/proguard-rules-base.pro +++ b/OpenKeychain/proguard-rules-base.pro @@ -10,8 +10,3 @@ -keepattributes ** -keep class org.sufficientlysecure.keychain.** { *; } - -# * Obfuscate android.support.v7.view.menu.** to fix Samsung Android 4.2 bug -# https://code.google.com/p/android/issues/detail?id=78377 -# * Disable obfuscation for all other classes --keepnames class !android.support.v7.view.menu.**, ** { *; } diff --git a/OpenKeychain/proguard-rules-okio.pro b/OpenKeychain/proguard-rules-okio.pro index 0050a4291..b2d5a36c3 100644 --- a/OpenKeychain/proguard-rules-okio.pro +++ b/OpenKeychain/proguard-rules-okio.pro @@ -1,2 +1,3 @@ +-dontwarn java.nio.file.* -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement -dontwarn okio.** diff --git a/OpenKeychain/proguard-rules-support.pro b/OpenKeychain/proguard-rules-support.pro index 4a08510d6..76265c712 100644 --- a/OpenKeychain/proguard-rules-support.pro +++ b/OpenKeychain/proguard-rules-support.pro @@ -1 +1,5 @@ +# Obfuscate android.support.v7.view.menu.** to fix Samsung Android 4.2 bug +# https://code.google.com/p/android/issues/detail?id=78377 +-keepnames class !android.support.v7.view.menu.**, ** { *; } + -keep class android.support.v7.widget.SearchView { *; }