Handle malformed requests in TaskerActivity

yangjianxiang · Dec 1, 2017 · 722ca5b · 722ca5b
1 parent 0171261
commit 722ca5b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/mobile/src/main/scala/com/github/shadowsocks/TaskerActivity.scala b/mobile/src/main/scala/com/github/shadowsocks/TaskerActivity.scala
@@ -82,14 +82,18 @@ class TaskerActivity extends AppCompatActivity {
 
   override def onCreate(savedInstanceState: Bundle) {
     super.onCreate(savedInstanceState)
+    try taskerOption = TaskerSettings.fromIntent(getIntent) catch {
+      case _: Exception =>
+        finish()
+        return
+    }
     setContentView(R.layout.layout_tasker)
 
     val toolbar = findViewById(R.id.toolbar).asInstanceOf[Toolbar]
     toolbar.setTitle(R.string.app_name)
     toolbar.setNavigationIcon(R.drawable.ic_navigation_close)
     toolbar.setNavigationOnClickListener(_ => finish())
 
-    taskerOption = TaskerSettings.fromIntent(getIntent)
     switch = findViewById(R.id.serviceSwitch).asInstanceOf[Switch]
     switch.setChecked(taskerOption.switchOn)
     val profilesList = findViewById(R.id.list).asInstanceOf[RecyclerView]

diff --git a/mobile/src/main/scala/com/github/shadowsocks/utils/TaskerSettings.scala b/mobile/src/main/scala/com/github/shadowsocks/utils/TaskerSettings.scala
@@ -30,8 +30,7 @@ object TaskerSettings {
   private val KEY_SWITCH_ON = "switch_on"
   private val KEY_PROFILE_ID = "profile_id"
 
-  def fromIntent(intent: Intent) = new TaskerSettings(if (intent.hasExtra(ApiIntent.EXTRA_BUNDLE))
-    intent.getBundleExtra(ApiIntent.EXTRA_BUNDLE) else Bundle.EMPTY)
+  def fromIntent(intent: Intent) = new TaskerSettings(intent.getBundleExtra(ApiIntent.EXTRA_BUNDLE))
 }
 
 class TaskerSettings(bundle: Bundle) {