[tor-commits] [orbot/master] update proguard rules

[n8fr8 at torproject.org]

commit 142d934d75c5131cfc7e2dacad3e1fb5edf9005a
Author: n8fr8 <nathan at freitas.net>
Date:   Wed May 9 13:30:05 2018 -0400

    update proguard rules
---
 app/proguard-rules.txt | 77 ++++----------------------------------------------
 project.properties     |  1 +
 2 files changed, 7 insertions(+), 71 deletions(-)

diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
index 126e1ff5..bc4eb0c1 100644
--- a/app/proguard-rules.txt
+++ b/app/proguard-rules.txt
@@ -1,71 +1,6 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /home/n8fr8/dev/android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontskipnonpubliclibraryclassmembers
--dontpreverify
--verbose
--repackageclasses ''
--allowaccessmodification
--keepattributes *Annotation*
-
--injars src/main/libs
-
--outjars bin/classes-processed.jar
-
--dontwarn javax.naming.**
--dontwarn android.support.**
-
-
-####
--keep class org.**  { *; }
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}
+-keepattributes Signature
+-keepattributes Annotation
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+-dontwarn okio.**
\ No newline at end of file
diff --git a/project.properties b/project.properties
index 145c9f25..a6be9bae 100644
--- a/project.properties
+++ b/project.properties
@@ -6,6 +6,7 @@
 # To customize properties used by the Ant build system use,
 # "ant.properties", and override values to adapt the script to your
 # project structure.
+proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt
 
 # Project target.