From faebc2d1ae9923cb653a10196a6175c014f781e1 Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Thu, 3 Jan 2019 23:33:46 +0800
Subject: [PATCH] Make root unavailable more informative

---
 .../main/java/be/mygod/vpnhotspot/widget/SmartSnackbar.kt   | 6 +++---
 mobile/src/main/res/values-zh-rCN/strings.xml               | 1 -
 mobile/src/main/res/values/strings.xml                      | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/widget/SmartSnackbar.kt b/mobile/src/main/java/be/mygod/vpnhotspot/widget/SmartSnackbar.kt
index b163a03a..d155d6f2 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/widget/SmartSnackbar.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/widget/SmartSnackbar.kt
@@ -27,9 +27,9 @@ sealed class SmartSnackbar {
             } else SnackbarWrapper(Snackbar.make(holder, text ?: null.toString(), Snackbar.LENGTH_LONG))
         }
         fun make(e: Throwable) = make(when (e) {
-            is NoShellException -> app.getText(R.string.root_unavailable)
-            else -> e.localizedMessage
-        })
+            is NoShellException -> e.cause ?: e
+            else -> e
+        }.localizedMessage)
     }
 
     class Register(lifecycle: Lifecycle, private val view: View) : LifecycleObserver {
diff --git a/mobile/src/main/res/values-zh-rCN/strings.xml b/mobile/src/main/res/values-zh-rCN/strings.xml
index 00d4fbbb..765c4a0d 100644
--- a/mobile/src/main/res/values-zh-rCN/strings.xml
+++ b/mobile/src/main/res/values-zh-rCN/strings.xml
@@ -121,7 +121,6 @@
         <item quantity="other">%d 个接口</item>
     </plurals>
 
-    <string name="root_unavailable">似乎没有 root</string>
     <string name="failure_reason_unknown">未知 #%d</string>
     <string name="exception_interface_not_found">错误：未找到下游接口</string>
     <string name="noisy_su_failure">发生异常，详情请查看调试信息。</string>
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index a01ba04d..0b43c268 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -132,7 +132,6 @@
         <item quantity="other">%d interfaces</item>
     </plurals>
 
-    <string name="root_unavailable">Root unavailable</string>
     <string name="failure_reason_unknown">unknown #%d</string>
     <string name="exception_interface_not_found">Fatal: Downstream interface not found</string>
     <string name="noisy_su_failure">Something went wrong, please check the debug information.</string>