From b14ff7082d1b7b23bbc914d7697be2e556276778 Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Wed, 13 Jul 2016 11:38:23 +0800
Subject: [PATCH] Remove camera requirement

---
 src/main/AndroidManifest.xml                      | 13 +++++++------
 .../shadowsocks/ProfileManagerActivity.scala      |  3 +++
 .../com/github/shadowsocks/ScannerActivity.scala  | 15 +++------------
 3 files changed, 13 insertions(+), 18 deletions(-)

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 @@
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.CAMERA" />
 
-    <uses-feature
-            android:name="android.hardware.touchscreen"
-            android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen"
+                  android:required="false"/>
+    <uses-feature android:name="android.hardware.camera"
+                  android:required="false"/>
+    <uses-feature android:name="android.hardware.nfc"
+                  android:required="false"/>
     <uses-feature android:name="android.software.leanback"
-                  android:required="false" />
-
-    <uses-feature android:name="android.hardware.nfc" android:required="false" />
+                  android:required="false"/>
 
     <uses-sdk
             android:minSdkVersion="16"
diff --git a/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala b/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
index 63476a32..4ec7a6b1 100644
--- a/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
+++ b/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
@@ -4,6 +4,7 @@ import java.nio.charset.Charset
 
 import android.app.Activity
 import android.content._
+import android.content.pm.PackageManager
 import android.nfc.NfcAdapter.CreateNdefMessageCallback
 import android.nfc.{NdefMessage, NdefRecord, NfcAdapter, NfcEvent}
 import android.os.{Bundle, Handler}
@@ -263,6 +264,8 @@ final class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClic
     val importAddFAB = findViewById(R.id.fab_import_add).asInstanceOf[FloatingActionButton]
     importAddFAB.setImageDrawable(dm.getDrawable(this, R.drawable.ic_content_paste))
     importAddFAB.setOnClickListener(this)
+    menu.setOnMenuToggleListener(opened => 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]) {