From 8a6b254799d62dbafea5e54484fde965e2a29d8e Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 30 Dec 2016 05:42:03 +0800
Subject: [PATCH] Bump version code and ready for release

---
 app/build.gradle                                            | 4 ++--
 app/proguard-rules.pro                                      | 3 +++
 app/src/main/java/com/topjohnwu/magisk/InstallFragment.java | 2 --
 app/src/main/java/com/topjohnwu/magisk/MainActivity.java    | 1 -
 app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java | 2 --
 app/src/main/java/com/topjohnwu/magisk/ReposFragment.java   | 2 --
 app/src/main/java/com/topjohnwu/magisk/StatusFragment.java  | 3 ---
 app/src/main/java/com/topjohnwu/magisk/utils/Async.java     | 3 ---
 app/src/main/res/layout/activity_about.xml                  | 4 ++--
 app/src/main/res/values-ar/strings.xml                      | 1 -
 app/src/main/res/values-de/strings.xml                      | 1 -
 app/src/main/res/values-es/strings.xml                      | 1 -
 app/src/main/res/values-it/strings.xml                      | 1 -
 app/src/main/res/values-nl/strings.xml                      | 1 -
 app/src/main/res/values-pt/strings.xml                      | 1 -
 app/src/main/res/values-zh-rCN/strings.xml                  | 1 -
 app/src/main/res/values/strings.xml                         | 1 -
 17 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a80b5d9f9..6f5664ca0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.topjohnwu.magisk"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 7
-        versionName "2.5"
+        versionCode 10
+        versionName "3.0"
         jackOptions {
             enabled true
         }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index d3890d692..8e6197c37 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -41,3 +41,6 @@
 -keep interface android.support.v7.internal.** { *; }
 -keep class android.support.v7.** { *; }
 -keep interface android.support.v7.** { *; }
+
+# SpongyCastle
+-keep class org.spongycastle.** {*;}
diff --git a/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java b/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java
index 5d5a86d70..902eba7f8 100644
--- a/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java
@@ -14,8 +14,6 @@ import android.widget.Spinner;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.receivers.MagiskDlReceiver;
-import com.topjohnwu.magisk.receivers.RepoDlReceiver;
-import com.topjohnwu.magisk.utils.Async;
 import com.topjohnwu.magisk.utils.CallbackHandler;
 import com.topjohnwu.magisk.utils.Utils;
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
index 48ada171f..267604ab3 100644
--- a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
@@ -9,7 +9,6 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
diff --git a/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java b/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
index 775335bef..ae20cb961 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
@@ -3,10 +3,8 @@ package com.topjohnwu.magisk;
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.RecyclerView;
diff --git a/app/src/main/java/com/topjohnwu/magisk/ReposFragment.java b/app/src/main/java/com/topjohnwu/magisk/ReposFragment.java
index e3cc45314..fe1bde0e3 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ReposFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/ReposFragment.java
@@ -1,9 +1,7 @@
 package com.topjohnwu.magisk;
 
 import android.app.Fragment;
-import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
diff --git a/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java b/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java
index 68e366db4..8692aaf86 100644
--- a/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java
@@ -2,12 +2,9 @@ package com.topjohnwu.magisk;
 
 import android.app.Fragment;
 import android.app.FragmentTransaction;
-import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Async.java b/app/src/main/java/com/topjohnwu/magisk/utils/Async.java
index 529647fca..9ed74fbe4 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/Async.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Async.java
@@ -2,13 +2,10 @@ package com.topjohnwu.magisk.utils;
 
 import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.preference.PreferenceManager;
 import android.provider.OpenableColumns;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.widget.Toast;
 
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 994da063e..bc6d8004f 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -42,8 +42,8 @@
                         android:padding="16dp">
 
                         <ImageView
-                            android:layout_width="48dp"
-                            android:layout_height="48dp"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
                             android:layout_gravity="center_vertical"
                             android:src="@mipmap/ic_launcher"/>
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 515592bc0..9f755dedf 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -60,7 +60,6 @@
 
     <!--Toasts, Dialogs-->
     <string name="permissionNotGranted">أن هذه الميزة لا تعمل دون الحصول على إذن الكتابة على التخزين الخارجي.</string>
-    <string name="no_root_access">لا يوجد أذونات الروت، الوظائف محدودة</string>
     <string name="no_thanks">لا شكراً</string>
     <string name="repo_install_title">تثبيت %1$s</string>
     <string name="repo_install_msg">هل تريد تثبيت %1$s ?</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 27fbbb462..08934ca7b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -58,7 +58,6 @@
 
     <!--Toasts, Dialogs-->
     <string name="permissionNotGranted">Diese Funktion wird ohne erlaubnis auf den externen Speicher zu schreiben nicht funktionieren.</string>
-    <string name="no_root_access">Kein root Zugriff, Funktion eingeschränkt</string>
     <string name="no_thanks">Nein Danke</string>
     <string name="repo_install_title">Installiere %1$s</string>
     <string name="repo_install_msg">Wollen Sie %1$s installieren?</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index eca29627b..1781305e2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -60,7 +60,6 @@
 
     <!--Toasts, Dialogs-->
     <string name="permissionNotGranted">Esta opción no funcionará sin permiso de escritura en la memoria externa</string>
-    <string name="no_root_access">No hay acceso a root, funcionalidad limitada</string>
     <string name="no_thanks">No gracias</string>
     <string name="repo_install_title">Instalar %1$s</string>
     <string name="repo_install_msg">¿ Quieres instalar %1$s ?</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 84cf532e2..df278ea6d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -58,7 +58,6 @@
 
     <!--Toasts, Dialogs-->
     <string name="permissionNotGranted">Questa funzione non funziona senza il permesso di scrivere sulla memoria di archiviazione esterna</string>
-    <string name="no_root_access">Accesso Root non trovato, funzionalità limitate</string>
     <string name="no_thanks">No grazie</string>
     <string name="repo_install_title">Installazione %1$s</string>
     <string name="repo_install_msg">Vuoi installare %1$s ?</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6c0e865e3..b63301ee7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -58,7 +58,6 @@
 
     <!--Toasts, Dialogs-->
     <string name="permissionNotGranted">Deze feature zal niet werken zonder permissie om op de externe opslag te schrijven.</string>
-    <string name="no_root_access">Geen root, functionaliteit beperkt</string>
     <string name="no_thanks">Nee bedankt</string>
     <string name="repo_install_title">Installeer %1$s</string>
     <string name="repo_install_msg">Wilt u  %1$s installeren?</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 9de37716b..0723261d2 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -56,7 +56,6 @@
 
     <!--Toasts, Dialogs-->
     <string name="permissionNotGranted">Este recurso não funcionará sem permissão de escrita do armazenamento externo.</string>
-    <string name="no_root_access">Sem acesso ao root, funcionalidade limitada</string>
     <string name="no_thanks">Não, Obrigado</string>
     <string name="repo_install_title">Instalar %1$s</string>
     <string name="repo_install_msg">Você deseja instalar%1$s ?</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index eb26637ea..384f11dae 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -60,7 +60,6 @@
 
     <!--Toasts, Dialogs-->
     <string name="permissionNotGranted">未授予写入外置存储权限，此功能无法正常工作。</string>
-    <string name="no_root_access">没有 ROOT 权限，功能受限</string>
     <string name="no_thanks">不，谢谢</string>
     <string name="repo_install_title">安装 %1$s</string>
     <string name="repo_install_msg">你想要安装 %1$s 吗？</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79c7e21d7..98901425d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -81,7 +81,6 @@
 
     <!--Toasts, Dialogs-->
     <string name="permissionNotGranted">This feature will not work without permission to write external storage.</string>
-    <string name="no_root_access">No root access, functionality limited</string>
     <string name="no_thanks">No thanks</string>
     <string name="repo_install_title">Install %1$s</string>
     <string name="repo_install_msg">Do you want to install %1$s ?</string>