Fix kernel params list with no busybox

Lennoard · Dec 29, 2019 · 3ea491a · 3ea491a
1 parent e39b4e5
commit 3ea491a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/activities/KernelParamsListActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/activities/KernelParamsListActivity.kt
@@ -64,7 +64,8 @@ class KernelParamsListActivity : AppCompatActivity() {
     private suspend fun getKernelParams() = withContext(Dispatchers.Default) {
         delay(500)
         val kernelParams = mutableListOf<KernelParameter>()
-        RootUtils.executeWithOutput("busybox sysctl -a", "") { line ->
+        val command = if (RootUtils.isBusyboxAvailable()) "busybox sysctl -a" else "sysctl -a"
+        RootUtils.executeWithOutput(command, "") { line ->
             line?.let {
                 if (!it.contains("denied") && !it.startsWith("sysctl") && it.contains("=")) {
                     val kernelParam = it.split("=").first().trim()

diff --git a/app/src/main/res/drawable/fast_scroll_thumb.xml b/app/src/main/res/drawable/fast_scroll_thumb.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/colorAccentLight" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#ccc" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/fast_scroll_track.xml b/app/src/main/res/drawable/fast_scroll_track.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#1FFFFFFF" />
+</shape>
diff --git a/app/src/main/res/layout/activity_kernel_params_list.xml b/app/src/main/res/layout/activity_kernel_params_list.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/paramsListSwipeLayout">
@@ -8,6 +9,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/paramsListRecyclerView"
-        android:scrollbars="vertical"/>
+        app:fastScrollEnabled="true"
+        app:fastScrollHorizontalThumbDrawable="@drawable/fast_scroll_thumb"
+        app:fastScrollHorizontalTrackDrawable="@drawable/fast_scroll_track"
+        app:fastScrollVerticalThumbDrawable="@drawable/fast_scroll_thumb"
+        app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track"
+        />
 
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>