BBI: Updated Gradle plugin, removed storage access permission

sunilpaulmathew · sunilpaulmathew · commit 1139968e970d · 2021-06-10T21:58:52.000+02:00
(no more needed), improved coding quality, and more

Signed-off-by: sunilpaulmathew &lt;sunil.kde@gmail.com&gt;
diff --git a/app/build.gradle b/app/build.gradle
@@ -55,7 +55,7 @@ repositories {
 
 dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    playImplementation 'com.android.billingclient:billing:3.0.3'
-    implementation "com.github.topjohnwu.libsu:core:3.0.2"
+    playImplementation 'com.android.billingclient:billing:4.0.0'
+    implementation "com.github.topjohnwu.libsu:core:3.1.2"
     implementation 'com.google.android.material:material:1.3.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.smartpack.busyboxinstaller" >
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/smartpack/busyboxinstaller/MainActivity.java b/app/src/main/java/com/smartpack/busyboxinstaller/MainActivity.java
@@ -7,7 +7,6 @@
 
 package com.smartpack.busyboxinstaller;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
@@ -22,7 +21,6 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.appcompat.widget.PopupMenu;
-import androidx.core.app.ActivityCompat;
 
 import com.google.android.material.checkbox.MaterialCheckBox;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -39,7 +37,7 @@
 public class MainActivity extends AppCompatActivity {
 
     private boolean mExit;
-    private Handler mHandler = new Handler();
+    private final Handler mHandler = new Handler();
     private LinearLayout mInstall;
     private LinearLayout mProgress;
     private MaterialTextView mInstallText;
@@ -213,12 +211,6 @@ private void installDialog() {
             Utils.snackbar(mInstall, getString(R.string.no_root_message));
             return;
         }
-        if (!Utils.checkWriteStoragePermission(this)) {
-            ActivityCompat.requestPermissions(this, new String[]{
-                    Manifest.permission.WRITE_EXTERNAL_STORAGE},1);
-            Utils.snackbar(mInstall, getString(R.string.no_permission_message));
-            return;
-        }
         MaterialAlertDialogBuilder install = new MaterialAlertDialogBuilder(this);
         install.setIcon(R.mipmap.ic_launcher);
         if (Utils.getArch().equals("aarch64") || Utils.getArch().equals("armv7l") || Utils.getArch().equals("armv8l")
@@ -471,8 +463,7 @@ private void refreshTitles() {
     public void onStart() {
         super.onStart();
 
-        if (!RootUtils.rootAccess() || !Utils.checkWriteStoragePermission(this)
-                || !Utils.getBoolean("update_dialogue", true, this)) {
+        if (!RootUtils.rootAccess() || !Utils.getBoolean("update_dialogue", true, this)) {
             return;
         }
 
diff --git a/app/src/main/java/com/smartpack/busyboxinstaller/utils/AboutActivity.java b/app/src/main/java/com/smartpack/busyboxinstaller/utils/AboutActivity.java
@@ -33,7 +33,7 @@
 
 public class AboutActivity extends AppCompatActivity {
 
-    private ArrayList <RecycleViewItem> mData = new ArrayList<>();
+    private final ArrayList <RecycleViewItem> mData = new ArrayList<>();
 
     @SuppressLint("SetTextI18n")
     @Override
diff --git a/app/src/main/java/com/smartpack/busyboxinstaller/utils/RootUtils.java b/app/src/main/java/com/smartpack/busyboxinstaller/utils/RootUtils.java
@@ -19,13 +19,7 @@
 public class RootUtils {
 
     static {
-        /* Shell.Config methods shall be called before any shell is created
-         * This is the why in this example we call it in a static block
-         * The followings are some examples, check Javadoc for more details */
-
-        //Shell.Config.setFlags(Shell.FLAG_REDIRECT_STDERR); (not yet, make it optional cuz it may break current stuff)
-        Shell.Config.verboseLogging(BuildConfig.DEBUG);
-        Shell.Config.setTimeout(10);
+        Shell.enableVerboseLogging = BuildConfig.DEBUG;
     }
 
     public static boolean rootAccess() {
diff --git a/app/src/main/java/com/smartpack/busyboxinstaller/utils/Utils.java b/app/src/main/java/com/smartpack/busyboxinstaller/utils/Utils.java
@@ -151,16 +151,6 @@ private static boolean existFile(String file, boolean root) {
         return !root ? new File(file).exists() : new RootFile(file).exists();
     }
 
-    /*
-     * Taken and used almost as such from the following stackoverflow discussion
-     * Ref: https://stackoverflow.com/questions/7203668/how-permission-can-be-checked-at-runtime-without-throwing-securityexception
-     */
-    public static boolean checkWriteStoragePermission(Context context) {
-        String permission = android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
-        int res = context.checkCallingOrSelfPermission(permission);
-        return (res == PackageManager.PERMISSION_GRANTED);
-    }
-
     public static boolean getBoolean(String name, boolean defaults, Context context) {
         return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(name, defaults);
     }
diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
@@ -18,7 +18,6 @@
     <string name="language_default">ነባር</string>
     <string name="list_applets">የአፕሌቶች ዝርዝር</string>
     <string name="list_applets_summary">የሚከተሉት አፕልቶች በዚህ ጥቅል ውስጥ ተካተዋል!\n\n - %s</string>
-    <string name="no_permission_message">ቢዚቦክስ ጭነት ያለ ማከማቻ ይፃፋል ተደራሽነት የለውም! ውርጃ</string>
     <string name="no_root_message">ቢዚቦክስ ጭነት ያለ Root መዳረሻ አይሰራም! ውርጃ</string>
     <string name="press_back">ለመውጣት መልሰህ ተጫን!</string>
     <string name="reboot">ድጋሚ አስነሳ</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -22,7 +22,6 @@
     <string name="language_default">"Výchozí"</string>
     <string name="list_applets">"Seznam Komponent"</string>
     <string name="list_applets_summary">"V tomto balíčku jsou dostupné následující komponenty!\n\n- %s"</string>
-    <string name="no_permission_message">"Instalace BusyBoxu nemůže pokračovat bez přístupu k úložišti! Ruším"</string>
     <string name="no_root_message">"Instalace BusyBoxu nemůže pokračovat bez ROOT přístupu! Ruším"</string>
     <string name="press_back">"Stiskněte znovu zpět pro ukončení"</string>
     <string name="reboot">"Restart"</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -20,7 +20,6 @@
     <string name="language_default">Προεπιλογή</string>
     <string name="list_applets">Λίστα Applets</string>
     <string name="list_applets_summary">Τα ακόλουθα applets συμπεριλαμβάνονται σε αυτό το πακέτο!\n\n - %s</string>
-    <string name="no_permission_message">Η εγκατάσταση BusyBox δε θα λειτουργήσει χωρίς Πρόσβαση στον Αποθηκευτικό Χώρο! Διακοπή</string>
     <string name="no_root_message">Η εγκατάσταση BusyBox δε θα λειτουργήσει χωρίς Πρόσβαση Root! Διακοπή</string>
     <string name="press_back">Πατήστε ξανά πίσω για έξοδο!</string>
     <string name="reboot">Επανεκκίνηση</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
@@ -23,7 +23,6 @@
     <string name="language_default">Default</string>
     <string name="list_applets">Daftar Applet</string>
     <string name="list_applets_summary">Applet berikut termasuk dalam paket ini!\n\n - %s</string>
-    <string name="no_permission_message">Penginstalan BusyBox tidak akan berfungsi tanpa Akses Tulis Penyimpanan! Membatalkan</string>
     <string name="no_root_message">Instalasi BusyBox tidak akan berfungsi tanpa Akses Root! Membatalkan</string>
     <string name="press_back">Tekan kembali untuk keluar!</string>
     <string name="reboot">Mulai ulang</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
@@ -22,7 +22,6 @@
     <string name="language_default">시스템 언어</string>
     <string name="list_applets">애플릿 종류</string>
     <string name="list_applets_summary">아래 애플릿들이 이 패키지에 포함되어 있어요.\n\n - %s</string>
-    <string name="no_permission_message">이 기능은 저장공간 쓰기 권한 없이 작동하지 않아요!</string>
     <string name="no_root_message">이 기능은 루트 권한 없이 작동하지 않아요!</string>
     <string name="press_back">나가려면 한 번 더 뒤로 가기 하세요.</string>
     <string name="reboot">다시 시작</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -16,7 +16,6 @@
     <string name="installing">Instalando o BusyBox v%s</string>
     <string name="language">Idioma (%s)</string>
     <string name="language_default">Padrão</string>
-    <string name="no_permission_message">A instalação do BusyBox não funcionará sem o acesso à gravação no armazenamento! Abortando</string>
     <string name="no_root_message">A instalação do BusyBox não funcionará sem o Acesso Root! Abortando</string>
     <string name="press_back">Pressione voltar novamente para sair!</string>
     <string name="reboot">Reiniciar</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -32,7 +32,6 @@
     <string name="language_ru" translatable="false">русский</string>
     <string name="list_applets">Applets List</string>
     <string name="list_applets_summary">The following applets are included in this package!\n\n - %s</string>
-    <string name="no_permission_message">BusyBox installation won\'t work without Storage Write Access! Aborting</string>
     <string name="no_root_message">BusyBox installation won\'t work without Root Access! Aborting</string>
     <string name="press_back">Press back again to exit!</string>
     <string name="reboot">Reboot</string>
diff --git a/app/src/play/java/com/smartpack/busyboxinstaller/utils/BillingActivity.java b/app/src/play/java/com/smartpack/busyboxinstaller/utils/BillingActivity.java
@@ -40,10 +40,10 @@
 
 public class BillingActivity extends AppCompatActivity {
 
-    private ArrayList <RecycleViewItem> mData = new ArrayList<>();
+    private final ArrayList <RecycleViewItem> mData = new ArrayList<>();
     private BillingClient mBillingClient;
     private boolean mClientInitialized = false;
-    private List<String> mSkuList = new ArrayList<>();
+    private final List<String> mSkuList = new ArrayList<>();
 
     @SuppressLint("UseCompatLoadingForDrawables")
     @Override
@@ -200,7 +200,7 @@ private void buyMeAMeal() {
     private void handlePurchases(Purchase purchase) {
         try {
             if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) {
-                if (purchase.getSku().equals("donation_coffee") || purchase.getSku().equals("donation_meal") || purchase.getSku().equals("donation_dinner")) {
+                if (purchase.getSkus().contains("donation_coffee") || purchase.getSkus().contains("donation_meal") || purchase.getSkus().contains("donation_dinner")) {
                     ConsumeParams consumeParams = ConsumeParams.newBuilder()
                             .setPurchaseToken(purchase.getPurchaseToken())
                             .build();
diff --git a/build.gradle b/build.gradle
@@ -3,18 +3,18 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.2.1'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ repositories {`
`55`	`55`
`56`	`56`	`dependencies {`
`57`	`57`	`implementation 'androidx.constraintlayout:constraintlayout:2.0.4'`
`58`		`- playImplementation 'com.android.billingclient:billing:3.0.3'`
`59`		`- implementation "com.github.topjohnwu.libsu:core:3.0.2"`
	`58`	`+ playImplementation 'com.android.billingclient:billing:4.0.0'`
	`59`	`+ implementation "com.github.topjohnwu.libsu:core:3.1.2"`
`60`	`60`	`implementation 'com.google.android.material:material:1.3.0'`
`61`	`61`	`}`