Fix a bug

OG-C · Nov 7, 2019 · 142b246 · 142b246
1 parent 3416ac6
commit 142b246
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/src/main/java/com/bige0/shadowsocksr/ProfileManagerActivity.kt b/app/src/main/java/com/bige0/shadowsocksr/ProfileManagerActivity.kt
@@ -308,7 +308,10 @@ class ProfileManagerActivity : AppCompatActivity(), View.OnClickListener, Toolba
 		}
 		catch (e: Throwable)
 		{
-			menu.toggle(false)
+			if (::menu.isInitialized)
+			{
+				menu.toggle(false)
+			}
 			startActivity(Intent(this, ScannerActivity::class.java))
 		}
 	}

diff --git a/app/src/main/java/com/bige0/shadowsocksr/ShadowsocksSettings.kt b/app/src/main/java/com/bige0/shadowsocksr/ShadowsocksSettings.kt
@@ -266,6 +266,7 @@ class ShadowsocksSettings : PreferenceFragment(), SharedPreferences.OnSharedPref
 		findPreference("about").setOnPreferenceClickListener {
 			ShadowsocksApplication.app.track(TAG, "about")
 			val web = WebView(activity)
+			web.isVerticalScrollBarEnabled = false
 			web.loadUrl("file:///android_asset/pages/about.html")
 			web.webViewClient = object : WebViewClient()
 			{