From ccb55205e6da41be064b3421d85e05c36062d9c7 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 20 Feb 2021 03:38:39 -0800
Subject: [PATCH] Fix pre 21 support

---
 .../java/com/topjohnwu/magisk/core/utils/Locales.kt    |  2 +-
 app/src/main/java/com/topjohnwu/magisk/ktx/XJava.kt    |  2 +-
 app/src/main/res/drawable/bg_line_bottom_rounded.xml   |  4 ++--
 app/src/main/res/drawable/bg_line_top_rounded.xml      |  4 ++--
 app/src/main/res/layout/item_log_track_md2.xml         | 10 ++++++----
 native/jni/su/connect.cpp                              |  2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/core/utils/Locales.kt b/app/src/main/java/com/topjohnwu/magisk/core/utils/Locales.kt
index 912c304ba..97b72bbe1 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/utils/Locales.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/utils/Locales.kt
@@ -38,7 +38,7 @@ withContext(Dispatchers.Default) {
         add("pt-BR")
 
         // Then add all supported locales
-        addAll(res.assets.locales)
+        addAll(Resources.getSystem().assets.locales)
     }.map {
         it.langTagToLocale()
     }.distinctBy {
diff --git a/app/src/main/java/com/topjohnwu/magisk/ktx/XJava.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XJava.kt
index e98e78b24..324ab5f61 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ktx/XJava.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XJava.kt
@@ -51,7 +51,7 @@ fun String.langTagToLocale(): Locale {
     if (Build.VERSION.SDK_INT >= 21) {
         return Locale.forLanguageTag(this)
     } else {
-        val tok = split("-".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+        val tok = split("[-_]".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
         if (tok.isEmpty()) {
             return Locale("")
         }
diff --git a/app/src/main/res/drawable/bg_line_bottom_rounded.xml b/app/src/main/res/drawable/bg_line_bottom_rounded.xml
index 7ead075af..b7232f24f 100644
--- a/app/src/main/res/drawable/bg_line_bottom_rounded.xml
+++ b/app/src/main/res/drawable/bg_line_bottom_rounded.xml
@@ -3,9 +3,9 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?colorSecondary" />
+            <solid android:color="@android:color/black" />
             <corners android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp" />
         </shape>
     </item>
 
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/drawable/bg_line_top_rounded.xml b/app/src/main/res/drawable/bg_line_top_rounded.xml
index 589b19ca4..ec332657f 100644
--- a/app/src/main/res/drawable/bg_line_top_rounded.xml
+++ b/app/src/main/res/drawable/bg_line_top_rounded.xml
@@ -3,9 +3,9 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?colorSecondary" />
+            <solid android:color="@android:color/black" />
             <corners android:topLeftRadius="2dp" android:topRightRadius="2dp" />
         </shape>
     </item>
 
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/layout/item_log_track_md2.xml b/app/src/main/res/layout/item_log_track_md2.xml
index 1fcdd001b..5e0f4f010 100644
--- a/app/src/main/res/layout/item_log_track_md2.xml
+++ b/app/src/main/res/layout/item_log_track_md2.xml
@@ -29,14 +29,15 @@
         tools:layout_gravity="center"
         tools:minHeight="?listPreferredItemHeightSmall">
 
-        <View
+        <ImageView
             android:id="@+id/track_top"
             invisible="@{isTop}"
             android:layout_width="2dp"
             android:layout_height="0dp"
             android:layout_marginBottom="2dp"
             android:alpha=".3"
-            android:background="@drawable/bg_line_bottom_rounded"
+            app:tint="?colorSecondary"
+            app:srcCompat="@drawable/bg_line_bottom_rounded"
             app:layout_constraintBottom_toTopOf="@+id/track_bullet"
             app:layout_constraintEnd_toEndOf="@+id/track_bullet"
             app:layout_constraintStart_toStartOf="@+id/track_bullet"
@@ -54,14 +55,15 @@
             app:tint="@color/color_primary_error_transient"
             tools:srcCompat="@drawable/ic_check_md2" />
 
-        <View
+        <ImageView
             android:id="@+id/track_bottom"
             invisible="@{isBottom}"
             android:layout_width="2dp"
             android:layout_height="0dp"
             android:layout_marginTop="2dp"
             android:alpha=".3"
-            android:background="@drawable/bg_line_top_rounded"
+            app:tint="?colorSecondary"
+            app:srcCompat="@drawable/bg_line_top_rounded"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/track_bullet"
             app:layout_constraintStart_toStartOf="@+id/track_bullet"
diff --git a/native/jni/su/connect.cpp b/native/jni/su/connect.cpp
index 5ad21f72b..542b196a0 100644
--- a/native/jni/su/connect.cpp
+++ b/native/jni/su/connect.cpp
@@ -145,7 +145,7 @@ static void exec_cmd(const char *action, vector<Extra> &data,
 
     // Finally, fallback to start activity with component name
     args[4] = "-n";
-    sprintf(target, "%s/a.m", info->str[SU_MANAGER].data());
+    sprintf(target, "%s/.ui.surequest.SuRequestActivity", info->str[SU_MANAGER].data());
     exec.fd = -2;
     exec.fork = fork_dont_care;
     exec_command(exec);