WIP sync

app/src/main/AndroidManifest.xml

@@ -3,7 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
 
     package="com.topjohnwu.magisk">
+
     <uses-sdk tools:overrideLibrary="com.kcoppock.broadcatsttilesupport" />
+
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

app/src/main/java/com/topjohnwu/magisk/RootFragment.java

@@ -19,6 +19,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.Switch;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.topjohnwu.magisk.receivers.Receiver;
 import com.topjohnwu.magisk.services.MonitorService;
@@ -113,6 +114,7 @@ public class RootFragment extends Fragment implements Receiver {
         autoRootToggle.setOnClickListener(toggle -> {
                     if (!Utils.hasServicePermission(getActivity())) {
                         Intent intent = new Intent(android.provider.Settings.ACTION_ACCESSIBILITY_SETTINGS);
+                        Toast.makeText(getActivity(),"Please enable accessibility access for Magisk's auto-toggle feature to work.", Toast.LENGTH_LONG).show();
                         startActivityForResult(intent, 100);
                     } else {
                         ToggleAutoRoot(autoRootToggle.isChecked());

app/src/main/java/com/topjohnwu/magisk/services/MonitorService.java

@@ -68,7 +68,7 @@ public class MonitorService extends AccessibilityService {
             ActivityInfo activityInfo = tryGetActivity(componentName);
             boolean isActivity = activityInfo != null;
             if (isActivity) {
-                Log.i("Magisk", "CurrentActivity: " + componentName.getPackageName());
+                Logger.dh("MonitorService: CurrentActivity: " + componentName.getPackageName());
                 String mPackage = componentName.getPackageName();
 
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

app/src/main/java/com/topjohnwu/magisk/services/TileServiceCompat.java

@@ -21,9 +21,9 @@ public class TileServiceCompat extends Service {
 
     private static boolean root, autoRoot;
 
-    public static final String TILE_ID = "com.shovelgrill.magiskmmtile.TILE";
+    public static final String TILE_ID = "Magisk";
-    public static final String ACTION_TILE_CLICK = "com.shovelgrill.magiskmmtile.ACTION_TILE_CLICK";
+    public static final String ACTION_TILE_CLICK = "magisk.ACTION_TILE_CLICK";
-    public static final String EXTRA_CLICK_TYPE = "com.shovelgrill.magiskmmtile.EXTRA_CLICK_TYPE";
+    public static final String EXTRA_CLICK_TYPE = "magisk.EXTRA_CLICK_TYPE";
     public static final int CLICK_TYPE_UNKNOWN = -1;
     public static final int CLICK_TYPE_SIMPLE = 0;
     public static final int CLICK_TYPE_LONG = 1;

app/src/main/java/com/topjohnwu/magisk/utils/Utils.java

@@ -266,11 +266,19 @@ public class Utils {
     }
 
     public static void installTile(Context context) {
+        String qsTileId;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            qsTileId = "custom(com.topjohnwu.magisk/.services.TileServiceNewApi)";
+        } else {
+            qsTileId = "intent(Magisk)";
+        }
 
-        String qsTileId = "intent(" + TileServiceCompat.TILE_ID + ")";
         List<String> lines = Shell.su("settings get secure sysui_qs_tiles");
         if (lines != null && lines.size() == 1) {
             List<String> tiles = new LinkedList<String>(Arrays.asList(lines.get(0).split(",")));
+            List<String> tiles2;
+            int tileSpace = Math.round(tiles.size()/2);
+            Logger.dh("Utils: Current Tile String is "+ tiles);
             if (tiles.size() > 1) {
                 for (String tile : tiles) {
                     if (tile.equals(qsTileId)) {
@@ -278,9 +286,15 @@ public class Utils {
                         return;
                     }
                 }
+
+                tiles.add(tiles.size() + 1, qsTileId);
                 String newTiles = TextUtils.join(",", tiles);
+                Logger.dh("Utils: NewtilesString is "+ newTiles);
                 Shell.su("settings put secure sysui_qs_tiles \"" + newTiles + "\"");
                 Toast.makeText(context, "Tile installed", Toast.LENGTH_SHORT).show();
+                if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M) {
+                    Utils.refreshService(context);
+                }
                 return;
             }
         }
@@ -290,7 +304,12 @@ public class Utils {
 
     public static void uninstallTile(Context context) {
 
-        String qsTileId = "intent(" + TileServiceCompat.TILE_ID + ")";
+        String qsTileId;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            qsTileId = "custom(com.topjohnwu.magisk/.services.TileServiceNewApi)";
+        } else {
+            qsTileId = "intent(Magisk)";
+        }
         List<String> lines = Shell.su("settings get secure sysui_qs_tiles");
         if (lines != null && lines.size() == 1) {
             List<String> tiles = new LinkedList<String>(Arrays.asList(lines.get(0).split(",")));
@@ -307,6 +326,9 @@ public class Utils {
                     String newTiles = TextUtils.join(",", tiles);
                     Shell.su("settings put secure sysui_qs_tiles \"" + newTiles + "\"");
                     Toast.makeText(context, "Tile uninstalled", Toast.LENGTH_SHORT).show();
+                    if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M) {
+                        Utils.refreshService(context);
+                    }
                     return;
                 }
                 Toast.makeText(context, "Tile already uninstalled", Toast.LENGTH_SHORT).show();
@@ -318,7 +340,9 @@ public class Utils {
     }
 
 
-    private void refreshService(Context context) {
+
+
+    private static void refreshService(Context context) {
         context.startService(new Intent(context, TileServiceCompat.class));
     }