Commit 90b5780d authored by Max Lv's avatar Max Lv

Fix #982

parent d1890448
...@@ -295,7 +295,7 @@ final class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClic ...@@ -295,7 +295,7 @@ final class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClic
case R.id.fab_qrcode_add => case R.id.fab_qrcode_add =>
menu.toggle(false) menu.toggle(false)
val intent = new Intent(this, classOf[ScannerActivity]) val intent = new Intent(this, classOf[ScannerActivity])
startActivityForResult(intent, REQUEST_QRCODE) startActivity(intent)
case R.id.fab_nfc_add => case R.id.fab_nfc_add =>
menu.toggle(true) menu.toggle(true)
val dialog = new AlertDialog.Builder(ProfileManagerActivity.this) val dialog = new AlertDialog.Builder(ProfileManagerActivity.this)
...@@ -385,14 +385,6 @@ final class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClic ...@@ -385,14 +385,6 @@ final class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClic
super.onDestroy super.onDestroy
} }
override def onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
if (requestCode == REQUEST_QRCODE && resultCode == Activity.RESULT_OK) {
val contents = data.getStringExtra("uri")
if (!TextUtils.isEmpty(contents))
Parser.findAll(contents).foreach(app.profileManager.createProfile)
}
}
override def onBackPressed() { override def onBackPressed() {
if (menu.isOpened) menu.close(true) else super.onBackPressed() if (menu.isOpened) menu.close(true) else super.onBackPressed()
} }
......
...@@ -8,8 +8,11 @@ import android.support.v4.app.ActivityCompat ...@@ -8,8 +8,11 @@ import android.support.v4.app.ActivityCompat
import android.support.v4.content.ContextCompat import android.support.v4.content.ContextCompat
import android.support.v7.app.AppCompatActivity import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.Toolbar import android.support.v7.widget.Toolbar
import android.text.TextUtils
import android.widget.Toast import android.widget.Toast
import com.google.zxing.Result import com.google.zxing.Result
import com.github.shadowsocks.ShadowsocksApplication.app
import com.github.shadowsocks.utils.Parser
import me.dm7.barcodescanner.zxing.ZXingScannerView import me.dm7.barcodescanner.zxing.ZXingScannerView
object ScannerActivity { object ScannerActivity {
...@@ -73,9 +76,9 @@ class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHand ...@@ -73,9 +76,9 @@ class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHand
} }
override def handleResult(rawResult: Result) = { override def handleResult(rawResult: Result) = {
val intent = new Intent() val uri = rawResult.getText
intent.putExtra("uri", rawResult.getText) if (!TextUtils.isEmpty(uri))
setResult(Activity.RESULT_OK, intent) Parser.findAll(uri).foreach(app.profileManager.createProfile)
navigateUp() navigateUp()
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment