Skip to content

Commit

Permalink
Bump version code and ready for release
Browse files Browse the repository at this point in the history
  • Loading branch information
topjohnwu committed Dec 29, 2016
1 parent 94562cb commit 8a6b254
Show file tree
Hide file tree
Showing 17 changed files with 7 additions and 25 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
3 changes: 3 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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.** {*;}
2 changes: 0 additions & 2 deletions app/src/main/java/com/topjohnwu/magisk/InstallFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
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;

Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/topjohnwu/magisk/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
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;
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
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;
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/com/topjohnwu/magisk/ReposFragment.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/java/com/topjohnwu/magisk/StatusFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

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;
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/java/com/topjohnwu/magisk/utils/Async.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@

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;

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 8a6b254

Please sign in to comment.