From 692b993eeec62e7684910d761f800f68b3f81b55 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 29 Sep 2016 03:37:57 +0800
Subject: [PATCH] Additional notice for Module updates

---
 .../java/com/topjohnwu/magisk/ModulesAdapter.java   | 13 +++++++++----
 .../java/com/topjohnwu/magisk/SplashActivity.java   |  4 ----
 .../java/com/topjohnwu/magisk/module/Module.java    | 11 ++++++++---
 .../main/java/com/topjohnwu/magisk/utils/Async.java |  2 +-
 .../main/java/com/topjohnwu/magisk/utils/Utils.java |  2 +-
 app/src/main/res/layout/list_item_module.xml        |  2 +-
 app/src/main/res/values/strings.xml                 |  1 +
 7 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/ModulesAdapter.java b/app/src/main/java/com/topjohnwu/magisk/ModulesAdapter.java
index 7d70bb626..1110f814b 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ModulesAdapter.java
+++ b/app/src/main/java/com/topjohnwu/magisk/ModulesAdapter.java
@@ -99,11 +99,17 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
             updateDeleteButton(holder, module);
         });
 
-        updateDeleteButton(holder, module);
+        if (module.isUpdated()) {
+            holder.notice.setVisibility(View.VISIBLE);
+            holder.notice.setText(R.string.update_file_created);
+            holder.delete.setEnabled(false);
+        } else {
+            updateDeleteButton(holder, module);
+        }
     }
 
     private void updateDeleteButton(ViewHolder holder, Module module) {
-        holder.warning.setVisibility(module.willBeRemoved() ? View.VISIBLE : View.GONE);
+        holder.notice.setVisibility(module.willBeRemoved() ? View.VISIBLE : View.GONE);
 
         if (module.willBeRemoved()) {
             holder.delete.setImageResource(R.drawable.ic_undelete);
@@ -122,10 +128,9 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
         @BindView(R.id.title) TextView title;
         @BindView(R.id.version_name) TextView versionName;
         @BindView(R.id.description) TextView description;
-        @BindView(R.id.warning) TextView warning;
+        @BindView(R.id.notice) TextView notice;
         @BindView(R.id.checkbox) CheckBox checkBox;
         @BindView(R.id.author) TextView author;
-//        @BindView(R.id.updateStatus) TextView updateStatus;
         @BindView(R.id.delete) ImageView delete;
 
         public ViewHolder(View itemView) {
diff --git a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
index ad47fa08b..d5bae8e33 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
@@ -25,12 +25,8 @@ public class SplashActivity extends AppCompatActivity {
         if (defaultPrefs.getString("theme","").equals("Dark")) {
             setTheme(R.style.AppTheme_dh);
         }
-        //setups go here
 
         // Set up default preferences,make sure we add "extra" blacklist entries.
-
-
-
         if (!defaultPrefs.contains("auto_blacklist")) {
             Logger.dev("SplashActivity: Setting default preferences for application");
             SharedPreferences.Editor editor = defaultPrefs.edit();
diff --git a/app/src/main/java/com/topjohnwu/magisk/module/Module.java b/app/src/main/java/com/topjohnwu/magisk/module/Module.java
index 20c7c3742..74c201975 100644
--- a/app/src/main/java/com/topjohnwu/magisk/module/Module.java
+++ b/app/src/main/java/com/topjohnwu/magisk/module/Module.java
@@ -6,9 +6,8 @@ import com.topjohnwu.magisk.utils.Utils;
 
 public class Module extends BaseModule {
 
-    private String mRemoveFile;
-    private String mDisableFile;
-    private boolean mEnable, mRemove;
+    private String mRemoveFile, mDisableFile, mUpdateFile;
+    private boolean mEnable, mRemove, mUpdated;
 
     public Module(String path) {
 
@@ -16,6 +15,7 @@ public class Module extends BaseModule {
 
         mRemoveFile = path + "/remove";
         mDisableFile = path + "/disable";
+        mUpdateFile = path + "/update";
 
         if (mId == null) {
             int sep = path.lastIndexOf('/');
@@ -29,6 +29,7 @@ public class Module extends BaseModule {
 
         mEnable = !Utils.itemExist(mDisableFile);
         mRemove = Utils.itemExist(mRemoveFile);
+        mUpdated = Utils.itemExist(mUpdateFile);
 
     }
 
@@ -56,4 +57,8 @@ public class Module extends BaseModule {
         return mRemove;
     }
 
+    public boolean isUpdated() {
+        return mUpdated;
+    }
+
 }
\ No newline at end of file
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 dab2bd50b..3e377e533 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/Async.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Async.java
@@ -42,7 +42,7 @@ public class Async {
 
         @Override
         protected Void doInBackground(Void... voids) {
-            String toolPath = mContext.getApplicationInfo().dataDir + "/busybox";
+            String toolPath = mContext.getApplicationInfo().dataDir + "/tools";
             String busybox = mContext.getApplicationInfo().dataDir + "/lib/libbusybox.so";
             String zip = mContext.getApplicationInfo().dataDir + "/lib/libzip.so";
             if (Shell.rootAccess()) {
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
index 32b60f513..02e356652 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
@@ -62,7 +62,7 @@ public class Utils {
         } else {
             MagiskFragment.magiskVersion = Integer.parseInt(ret.get(0));
         }
-        String toolPath = context.getApplicationInfo().dataDir + "/busybox";
+        String toolPath = context.getApplicationInfo().dataDir + "/tools";
         Shell.su("PATH=$PATH:" + toolPath);
     }
 
diff --git a/app/src/main/res/layout/list_item_module.xml b/app/src/main/res/layout/list_item_module.xml
index 9707a89c1..ca73f206b 100644
--- a/app/src/main/res/layout/list_item_module.xml
+++ b/app/src/main/res/layout/list_item_module.xml
@@ -70,7 +70,7 @@
             android:textIsSelectable="false"/>
 
         <TextView
-            android:id="@+id/warning"
+            android:id="@+id/notice"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/description"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 711fba218..ceb4f62c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,6 +49,7 @@
     <string name="no_info_provided">(No info provided)</string>
     <string name="no_modules_found">No modules found</string>
     <string name="module_not_installed">Module is not installed</string>
+    <string name="update_file_created">Module will be updated at next reboot</string>
     <string name="remove_file_created">Module will be removed at next reboot</string>
     <string name="remove_file_deleted">Module will not be removed at next reboot</string>
     <string name="disable_file_created">Module will be disabled at next reboot</string>