From 5abd3661c3b98b2701a500b830d1a441d07a6583 Mon Sep 17 00:00:00 2001 From: Mygod Date: Sun, 30 Dec 2018 17:57:53 +0800 Subject: [PATCH] Log less --- .../main/java/be/mygod/vpnhotspot/MainActivity.kt | 15 ++++++--------- .../java/be/mygod/vpnhotspot/manage/ManageBar.kt | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt b/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt index 834e230b..a5855fd7 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt @@ -9,7 +9,6 @@ import android.view.MenuItem import androidx.appcompat.app.AppCompatActivity import androidx.browser.customtabs.CustomTabsIntent import androidx.core.content.ContextCompat -import androidx.core.os.bundleOf import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment import androidx.lifecycle.Observer @@ -35,15 +34,13 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS .build() } - fun launchUrl(url: Uri) = if (packageManager.hasSystemFeature("android.hardware.faketouch")) try { - customTabsIntent.launchUrl(this, url) - } catch (e: ActivityNotFoundException) { - DebugHelper.logEvent("launch_url", bundleOf(Pair("message", e.message))) + fun launchUrl(url: Uri) { + if (packageManager.hasSystemFeature("android.hardware.faketouch")) try { + customTabsIntent.launchUrl(this, url) + return + } catch (_: ActivityNotFoundException) { } catch (_: SecurityException) { } SmartSnackbar.make(url.toString()).show() - } catch (e: SecurityException) { - DebugHelper.logEvent("launch_url", bundleOf(Pair("message", e.message))) - SmartSnackbar.make(url.toString()).show() - } else SmartSnackbar.make(url.toString()).show() + } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/ManageBar.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/ManageBar.kt index 95531598..52d03634 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/ManageBar.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/ManageBar.kt @@ -54,7 +54,7 @@ object ManageBar : Manager() { private fun startAlternative(context: Context, e: RuntimeException) { try { - context.startActivity(Intent().setClassName("com.android.settings", SETTINGS_2)) + context.startActivity(Intent().setClassName(SETTINGS_PACKAGE, SETTINGS_2)) DebugHelper.logEvent(TAG, bundleOf(Pair(SETTINGS_1, e.message))) } catch (e: ActivityNotFoundException) { DebugHelper.logEvent(TAG, bundleOf(Pair(SETTINGS_1, e.message), Pair(SETTINGS_2, e.message)))