Commit 528fea13 authored by Max Lv's avatar Max Lv

Clean up

parent 5d7e8831
package com.github.shadowsocks package com.github.shadowsocks
import android.Manifest
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
...@@ -48,13 +47,13 @@ class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHand ...@@ -48,13 +47,13 @@ class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHand
override def onResume() { override def onResume() {
super.onResume() super.onResume()
val permissionCheck = ContextCompat.checkSelfPermission(this, val permissionCheck = ContextCompat.checkSelfPermission(this,
Manifest.permission.CAMERA) android.Manifest.permission.CAMERA)
if (permissionCheck == PackageManager.PERMISSION_GRANTED) { if (permissionCheck == PackageManager.PERMISSION_GRANTED) {
scannerView.setResultHandler(this) // Register ourselves as a handler for scan results. scannerView.setResultHandler(this) // Register ourselves as a handler for scan results.
scannerView.startCamera() // Start camera on resume scannerView.startCamera() // Start camera on resume
} else { } else {
ActivityCompat.requestPermissions(this, ActivityCompat.requestPermissions(this,
Array(Manifest.permission.CAMERA), MY_PERMISSIONS_REQUEST_CAMERA) Array(android.Manifest.permission.CAMERA), MY_PERMISSIONS_REQUEST_CAMERA)
} }
} }
......
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