From cf6a2571431cf32afee71b65075f00c776ce8940 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Tue, 23 May 2017 18:56:09 -0400
Subject: [PATCH] Activate ProGuard; test signed release APK instead of debug

---
 TestKeystore.jks                  | Bin 0 -> 2270 bytes
 app/build.gradle                  |   2 +-
 app/proguard-rules.txt            |  46 ++++++++++++++++++++++++++++--
 app/src/debug/AndroidManifest.xml |  39 -------------------------
 run_tests                         |  46 ++++++++++++++++++++++--------
 5 files changed, 78 insertions(+), 55 deletions(-)
 create mode 100644 TestKeystore.jks
 delete mode 100644 app/src/debug/AndroidManifest.xml

diff --git a/TestKeystore.jks b/TestKeystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..83f0bc0e623567844b8c766625c23046a3a655a5
GIT binary patch
literal 2270
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
ae;cPK0$jU;Qc3N(zgoBHm%pukz3v~RUEXm3

literal 0
HcmV?d00001

diff --git a/app/build.gradle b/app/build.gradle
index 2a5e4fd2c..41f43d75c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,7 +22,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
         debug {
diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
index 363b143b7..f30a55588 100644
--- a/app/proguard-rules.txt
+++ b/app/proguard-rules.txt
@@ -1,3 +1,43 @@
--dontwarn java.beans.**
--dontwarn java.lang.**
--dontobfuscate
\ No newline at end of file
+-dontwarn java.**
+-dontwarn javax.**
+-dontwarn com.google.auto.**
+-dontwarn com.google.errorprone.annotations.**
+-dontwarn com.google.j2objc.annotations.**
+-dontwarn okio.**
+-dontwarn okhttp3.**
+-dontwarn sun.misc.**
+-dontwarn org.codehaus.mojo.**
+-dontwarn com.google.gson.internal.*
+-dontwarn com.google.common.util.concurrent.*
+-dontwarn com.google.auto.common.*
+-dontwarn org.apache.commons.beanutils.*
+-dontwarn org.isoron.uhabits.HabitsApplication
+
+-dontobfuscate
+
+-keep class sun.misc.Unsafe { *; }
+-keep class org.isoron.** { *; }
+
+-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.preference.Preference
+-keep public class * extends android.view.View {
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+-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.content.Context {
+    public void *(android.view.View);
+    public void *(android.view.MenuItem);
+}
+-keep public class * extends android.app.Activity
+-dontskipnonpubliclibraryclassmembers
\ No newline at end of file
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
deleted file mode 100644
index be52ed256..000000000
--- a/app/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-<manifest
-    package="org.isoron.uhabits"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.SET_ANIMATION_SCALE"/>
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        tools:replace="maxSdkVersion"
-        android:maxSdkVersion="99" />
-
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        tools:replace="maxSdkVersion"
-        android:maxSdkVersion="99" />
-
-</manifest>
diff --git a/run_tests b/run_tests
index 315d942cc..63042b5a1 100755
--- a/run_tests
+++ b/run_tests
@@ -19,12 +19,18 @@ fi
 
 AVD_NAME=$1
 AVD_SERIAL=$2
+
 ADB="${ANDROID_HOME}/platform-tools/adb -s emulator-${AVD_SERIAL}"
 EMULATOR="${ANDROID_HOME}/tools/emulator"
-GRADLE="./gradlew --no-daemon --stacktrace"
+GRADLE="./gradlew --stacktrace"
 PACKAGE_NAME=org.isoron.uhabits
 OUTPUTS_DIR=app/build/outputs
 
+KEYFILE="TestKeystore.jks"
+KEY_ALIAS="default"
+KEY_PASSWORD="qwe123" 
+STORE_PASSWORD="qwe123"
+
 info() {
     if [ ! -z "$TEAMCITY_VERSION" ]; then
         echo "###teamcity[progressMessage '$1']"
@@ -35,8 +41,12 @@ info() {
     fi
 }
 
-fail() {
+cleanup() {
     $ADB emu kill
+    $GRADLE --stop
+}
+
+fail() {
     exit 1
 }
 
@@ -56,24 +66,36 @@ rm -rf ${OUTPUTS_DIR}
 mkdir -p ${OUTPUTS_DIR}
 
 #--------------------------------------------------------------------------------
-info "Building instrumentation APKs"
-$GRADLE assembleDebug assembleAndroidTest  || fail
+info "Building release APK"
+./gradlew assembleRelease \
+    -Pandroid.injected.signing.store.file=$KEYFILE \
+    -Pandroid.injected.signing.store.password=$STORE_PASSWORD \
+    -Pandroid.injected.signing.key.alias=$KEY_ALIAS \
+    -Pandroid.injected.signing.key.password=$KEY_PASSWORD || fail
 
 #--------------------------------------------------------------------------------
-info "Installing APKs"
-$ADB install -r ${OUTPUTS_DIR}/apk/app-debug.apk  || fail
-$ADB install -r ${OUTPUTS_DIR}/apk/app-debug-androidTest.apk || fail
+info "Building instrumentation APK"
+$GRADLE assembleAndroidTest  \
+    -Pandroid.injected.signing.store.file=$KEYFILE \
+    -Pandroid.injected.signing.store.password=$STORE_PASSWORD \
+    -Pandroid.injected.signing.key.alias=$KEY_ALIAS \
+    -Pandroid.injected.signing.key.password=$KEY_PASSWORD || fail
 
 #--------------------------------------------------------------------------------
-info "Granting permissions"
-$ADB shell pm grant org.isoron.uhabits android.permission.SET_ANIMATION_SCALE || fail
+info "Installing APKs"
+$ADB uninstall ${PACKAGE_NAME}
+$ADB install -r ${OUTPUTS_DIR}/apk/app-release.apk  || fail
+$ADB install -r ${OUTPUTS_DIR}/apk/app-debug-androidTest.apk || fail
 
 #--------------------------------------------------------------------------------
 info "Running instrumentation tests"
-$ADB shell am instrument -r -e coverage true -e size medium \
+$ADB shell am instrument \
+    -r -e coverage true -e size medium \
     -w ${PACKAGE_NAME}.test/android.support.test.runner.AndroidJUnitRunner \
     > ${OUTPUTS_DIR}/instrument.txt
 
+#--------------------------------------------------------------------------------
+info "Parsing test results"
 java -jar tools/automator-log-converter-1.5.0.jar ${OUTPUTS_DIR}/instrument.txt || fail
 
 #--------------------------------------------------------------------------------
@@ -103,7 +125,7 @@ info "Uninstalling test APK"
 $ADB uninstall ${PACKAGE_NAME}.test || fail
 
 #--------------------------------------------------------------------------------
-info "Stopping emulator"
-$ADB emu kill
+info "Stopping emulator and cleaning up"
+cleanup
 
 exit $failed