Add back internal QR scanner. #1273

2017-06-05 09:28:34 +08:00
parent 1e750e45e9
commit 49e30e7b09
10 changed files with 138 additions and 11 deletions
@@ -352,21 +352,16 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic

  def onMenuItemClick(item: MenuItem): Boolean = item.getItemId match {
    case R.id.action_scan_qr_code =>
-      def installScanner() = {
-        Toast.makeText(getActivity, R.string.add_profile_scanner_not_installed, Toast.LENGTH_LONG).show()
-        try startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=com.google.zxing.client.android"))) catch {
-          case exc: ActivityNotFoundException => exc.printStackTrace()
-        }
-      }
      try startActivityForResult(new Intent("com.google.zxing.client.android.SCAN")
        .addCategory(Intent.CATEGORY_DEFAULT)
        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_DOCUMENT),
        REQUEST_SCAN_QR_CODE) catch {
-        case _: ActivityNotFoundException => installScanner()
+        case _: ActivityNotFoundException =>
+          startActivity(new Intent(getActivity, classOf[ScannerActivity]))
        case e: SecurityException =>
          e.printStackTrace()
          app.track(e)
-          installScanner()
+          startActivity(new Intent(getActivity, classOf[ScannerActivity]))
      }
      true
    case R.id.action_import =>
@@ -0,0 +1,105 @@
+/*******************************************************************************/
+/*                                                                             */
+/*  Copyright (C) 2016 by Max Lv <max.c.lv@gmail.com>                          */
+/*  Copyright (C) 2016 by Mygod Studio <contact-shadowsocks-android@mygod.be>  */
+/*                                                                             */
+/*  This program is free software: you can redistribute it and/or modify       */
+/*  it under the terms of the GNU General Public License as published by       */
+/*  the Free Software Foundation, either version 3 of the License, or          */
+/*  (at your option) any later version.                                        */
+/*                                                                             */
+/*  This program is distributed in the hope that it will be useful,            */
+/*  but WITHOUT ANY WARRANTY; without even the implied warranty of             */
+/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              */
+/*  GNU General Public License for more details.                               */
+/*                                                                             */
+/*  You should have received a copy of the GNU General Public License          */
+/*  along with this program. If not, see <http://www.gnu.org/licenses/>.       */
+/*                                                                             */
+/*******************************************************************************/
+
+package com.github.shadowsocks
+
+import android.app.{Activity, TaskStackBuilder}
+import android.content.Intent
+import android.content.pm.{PackageManager, ShortcutManager}
+import android.os.{Build, Bundle}
+import android.support.v4.app.ActivityCompat
+import android.support.v4.content.ContextCompat
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.widget.Toolbar
+import android.text.TextUtils
+import android.widget.Toast
+import com.google.zxing.Result
+import com.github.shadowsocks.ShadowsocksApplication.app
+import com.github.shadowsocks.utils.Parser
+import me.dm7.barcodescanner.zxing.ZXingScannerView
+
+object ScannerActivity {
+  private final val MY_PERMISSIONS_REQUEST_CAMERA = 1
+}
+
+class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHandler {
+  import ScannerActivity._
+
+  private var scannerView: ZXingScannerView = _
+
+  override def onRequestPermissionsResult(requestCode: Int, permissions: Array[String],
+    grantResults: Array[Int]) {
+    if (requestCode == MY_PERMISSIONS_REQUEST_CAMERA) {
+      // If request is cancelled, the result arrays are empty.
+      if (grantResults.length > 0
+        && grantResults(0) == PackageManager.PERMISSION_GRANTED) {
+          scannerView.setResultHandler(this)
+          scannerView.startCamera()
+      } else {
+        Toast.makeText(this, R.string.add_profile_scanner_permission_required, Toast.LENGTH_SHORT).show()
+        finish()
+      }
+    }
+  }
+
+  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())
+    scannerView = findViewById(R.id.scanner).asInstanceOf[ZXingScannerView]
+    if (Build.VERSION.SDK_INT >= 25) getSystemService(classOf[ShortcutManager]).reportShortcutUsed("scan")
+  }
+
+  override def onResume() {
+    super.onResume()
+    val permissionCheck = ContextCompat.checkSelfPermission(this,
+      android.Manifest.permission.CAMERA)
+    if (permissionCheck == PackageManager.PERMISSION_GRANTED) {
+      scannerView.setResultHandler(this) // Register ourselves as a handler for scan results.
+      scannerView.startCamera()          // Start camera on resume
+    } else {
+      ActivityCompat.requestPermissions(this,
+        Array(android.Manifest.permission.CAMERA), MY_PERMISSIONS_REQUEST_CAMERA)
+    }
+  }
+
+  override def onPause() {
+    super.onPause()
+    scannerView.stopCamera()           // Stop camera on pause
+  }
+
+  override def handleResult(rawResult: Result) = {
+    val uri = rawResult.getText
+    if (!TextUtils.isEmpty(uri))
+      Parser.findAll(uri).foreach(app.profileManager.createProfile)
+    navigateUp()
+  }
+}
+