From e7d2dec952fc2bc61675550bee5f7b53241b5bee Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sun, 18 Dec 2016 00:03:26 +0800
Subject: [PATCH] Don't navigate up if scanning was cancelled

---
 src/main/AndroidManifest.xml                    |  2 +-
 .../github/shadowsocks/ScannerActivity.scala    | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 95c4bbf7..681de87b 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -74,7 +74,7 @@
                 android:name=".ShadowsocksRunnerActivity"
                 android:theme="@android:style/Theme.Translucent.NoTitleBar"
                 android:excludeFromRecents="true"
-		android:taskAffinity=""
+		        android:taskAffinity=""
                 android:launchMode="singleTask"/>
 
         <activity
diff --git a/src/main/scala/com/github/shadowsocks/ScannerActivity.scala b/src/main/scala/com/github/shadowsocks/ScannerActivity.scala
index 32678ae1..51cb1d63 100644
--- a/src/main/scala/com/github/shadowsocks/ScannerActivity.scala
+++ b/src/main/scala/com/github/shadowsocks/ScannerActivity.scala
@@ -58,20 +58,13 @@ class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHand
     }
   }
 
-  def navigateUp() {
-    val intent = getParentActivityIntent
-    if (shouldUpRecreateTask(intent) || isTaskRoot)
-      TaskStackBuilder.create(this).addNextIntentWithParentStack(intent).startActivities()
-    else finish()
-  }
-
   override def onCreate(state: Bundle) {
     super.onCreate(state)
     setContentView(R.layout.layout_scanner)
     val toolbar = findViewById(R.id.toolbar).asInstanceOf[Toolbar]
     toolbar.setTitle(getTitle)
-    toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material)
-    toolbar.setNavigationOnClickListener(_ => navigateUp())
+    toolbar.setNavigationIcon(R.drawable.ic_navigation_close)
+    toolbar.setNavigationOnClickListener(_ => finish())
     scannerView = findViewById(R.id.scanner).asInstanceOf[ZXingScannerView]
     if (Build.VERSION.SDK_INT >= 25) getSystemService(classOf[ShortcutManager]).reportShortcutUsed("scan")
   }
@@ -98,7 +91,9 @@ class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHand
     val uri = rawResult.getText
     if (!TextUtils.isEmpty(uri))
       Parser.findAll(uri).foreach(app.profileManager.createProfile)
-    navigateUp()
+    val intent = getParentActivityIntent
+    if (shouldUpRecreateTask(intent) || isTaskRoot)
+      TaskStackBuilder.create(this).addNextIntentWithParentStack(intent).startActivities()
+    else finish()
   }
 }
-