diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index af2a50f0..a2166d88 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -9,13 +9,14 @@
-
+
+
+
-
-
+ android:required="false"/>
if (opened) qrcodeAddFAB.setVisibility(
+ if (getPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)) View.VISIBLE else View.GONE))
}
diff --git a/src/main/scala/com/github/shadowsocks/ScannerActivity.scala b/src/main/scala/com/github/shadowsocks/ScannerActivity.scala
index 1bd55d1b..95b9b766 100644
--- a/src/main/scala/com/github/shadowsocks/ScannerActivity.scala
+++ b/src/main/scala/com/github/shadowsocks/ScannerActivity.scala
@@ -1,33 +1,24 @@
package com.github.shadowsocks
+import android.Manifest
import android.app.Activity
import android.content.Intent
import android.content.pm.PackageManager
-import android.Manifest
import android.os.Bundle
-import android.os.Handler
import android.support.v4.app.ActivityCompat
-import android.support.v4.app.NavUtils
import android.support.v4.content.ContextCompat
-import android.support.v7.app.ActionBar
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.Toolbar
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
+import android.view.{MenuItem, ViewGroup}
import android.widget.Toast
-
import com.google.zxing.Result
-
-import me.dm7.barcodescanner.core.IViewFinder
-import me.dm7.barcodescanner.core.ViewFinderView
import me.dm7.barcodescanner.zxing.ZXingScannerView
class ScannerActivity extends AppCompatActivity with ZXingScannerView.ResultHandler {
val MY_PERMISSIONS_REQUEST_CAMERA = 1
- var scannerView: ZXingScannerView = null
+ var scannerView: ZXingScannerView = _
override def onRequestPermissionsResult(requestCode: Int, permissions: Array[String],
grantResults: Array[Int]) {