From 528fea136de553e1f90afdd8392d8661320b8fe8 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Wed, 28 Sep 2016 10:40:16 +0800 Subject: [PATCH] Clean up --- src/main/scala/com/github/shadowsocks/ScannerActivity.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/ScannerActivity.scala b/src/main/scala/com/github/shadowsocks/ScannerActivity.scala index 95b9b766..697f99cf 100644 --- a/src/main/scala/com/github/shadowsocks/ScannerActivity.scala +++ b/src/main/scala/com/github/shadowsocks/ScannerActivity.scala @@ -1,6 +1,5 @@ package com.github.shadowsocks -import android.Manifest import android.app.Activity import android.content.Intent import android.content.pm.PackageManager @@ -48,13 +47,13 @@ class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHand override def onResume() { super.onResume() val permissionCheck = ContextCompat.checkSelfPermission(this, - Manifest.permission.CAMERA) + 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(Manifest.permission.CAMERA), MY_PERMISSIONS_REQUEST_CAMERA) + Array(android.Manifest.permission.CAMERA), MY_PERMISSIONS_REQUEST_CAMERA) } }