-
-
Notifications
You must be signed in to change notification settings - Fork 11.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
138 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:orientation="vertical"> | ||
| <include layout="@layout/toolbar_light_dark" /> | ||
| <me.dm7.barcodescanner.zxing.ZXingScannerView android:id="@+id/scanner" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="0dp" | ||
| android:layout_weight="1"/> | ||
| </LinearLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 105 additions & 0 deletions
105
mobile/src/main/scala/com/github/shadowsocks/ScannerActivity.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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() | ||
| } | ||
| } | ||
|
|