tweaked proguard

briar-android/build.gradle

@@ -6,12 +6,11 @@ repositories {
 }
 
 dependencies {
-    def supportVersion = '23.1.1'
 
+    def supportVersion = '23.1.1'
     compile project(':briar-api')
     compile project(':briar-core')
     compile fileTree(dir: 'libs', include: '*.jar')
-    compile fileTree(dir: 'libs', include: '*.jar')
     compile "com.android.support:support-v4:$supportVersion"
     compile("com.android.support:appcompat-v7:$supportVersion") {
         exclude module: 'support-v4'
@@ -24,7 +23,6 @@ dependencies {
         exclude module: 'preference-v7'
         exclude module: 'recyclerview-v7'
     }
-
     compile("com.android.support:design:$supportVersion") {
         exclude module: 'support-v4'
         exclude module: 'recyclerview-v7'
@@ -80,6 +78,7 @@ android {
 
     buildTypes {
         debug {
+            // Set this to true to run proguard in debug
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }

briar-android/proguard-rules.txt

@@ -1,12 +1,12 @@
--optimizationpasses 5
 -dontusemixedcaseclassnames
 -dontskipnonpubliclibraryclasses
 -dontpreverify
+-dontobfuscate
 -verbose
 -optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
--ignorewarnings
--renamesourcefileattribute SourceFile
--keepattributes SourceFile,LineNumberTable,*Annotation*,Signature
+# For comfortability in case we do obfuscate
+# -renamesourcefileattribute SourceFile
+-keepattributes SourceFile,LineNumberTable,*Annotation*,Signature, InnerClasses, EnclosingMethod
 
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Application
@@ -40,8 +40,17 @@
     void *(**On*Event);
 }
 
+-keep class org.h2.** { *; }
 -keep class org.briarproject.** { *; }
 -keep class com.google.inject.** { *; }
 -keep class javax.inject.** { *; }
 -keep class javax.annotation.** { *; }
--keep class roboguice.** { *; }
+-keep class roboguice.** { *; }
+
+-dontwarn org.h2.**
+-dontnote org.h2.**
+-dontwarn net.sf.cglib.**
+-dontwarn org.briarproject.plugins.tcp.**
+-dontwarn roboguice.**
+-dontwarn net.sourceforge.jsocks.**
+-dontnote android.support.**

briar-android/project.properties

@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-rules.txt
+
+# Project target.
+target=android-22