不要なパーミッションの整理など。

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b2835a0..581b019 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,12 +5,9 @@
     <uses-feature android:name="com.theta360.receptor.v" android:required="true"/>
     <uses-feature android:name="com.theta360.receptor.z1" android:required="true"/>
 
-    <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application

diff --git a/app/src/main/java/jp/osdn/gokigen/thetathoughtshutter/MainActivity.kt b/app/src/main/java/jp/osdn/gokigen/thetathoughtshutter/MainActivity.kt
index 21e4600..7418a93 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/thetathoughtshutter/MainActivity.kt
+++ b/app/src/main/java/jp/osdn/gokigen/thetathoughtshutter/MainActivity.kt
@@ -1,9 +1,13 @@
 package jp.osdn.gokigen.thetathoughtshutter
 
+import android.Manifest
 import android.bluetooth.BluetoothDevice
+import android.content.pm.PackageManager
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import com.theta360.pluginlibrary.activity.PluginActivity
 import com.theta360.pluginlibrary.callback.KeyCallback
 import com.theta360.pluginlibrary.receiver.KeyReceiver
@@ -21,7 +25,6 @@ import jp.osdn.gokigen.thetathoughtshutter.theta.ThetaSetupBluetoothSPP
 import jp.osdn.gokigen.thetathoughtshutter.theta.operation.IOperationCallback
 import jp.osdn.gokigen.thetathoughtshutter.theta.status.ThetaCameraStatusWatcher
 import java.util.*
-import kotlin.collections.HashMap
 
 class MainActivity : PluginActivity(), IBluetoothScanResult, IDetectSensingReceiver
 {
@@ -34,15 +37,54 @@ class MainActivity : PluginActivity(), IBluetoothScanResult, IDetectSensingRecei
     companion object
     {
         private val TAG = MainActivity::class.java.simpleName
+        private const val REQUEST_CODE_PERMISSIONS = 10
+        private val REQUIRED_PERMISSIONS = arrayOf(
+                Manifest.permission.INTERNET,
+                Manifest.permission.BLUETOOTH,
+                Manifest.permission.BLUETOOTH_ADMIN,
+                Manifest.permission.ACCESS_COARSE_LOCATION,
+        )
     }
 
+    private fun allPermissionsGranted() = REQUIRED_PERMISSIONS.all {
+        ContextCompat.checkSelfPermission(baseContext, it) == PackageManager.PERMISSION_GRANTED
+    }
+
+
     override fun onCreate(savedInstanceState: Bundle?)
     {
         super.onCreate(savedInstanceState)
         setContentView(layout.activity_main)
-
         setAutoClose(true)
+        updateStatus(applicationStatus.status)
+
+        if (allPermissionsGranted())
+        {
+            initializeKeyOperation()
+        }
+        else
+        {
+            ActivityCompat.requestPermissions(this, REQUIRED_PERMISSIONS, REQUEST_CODE_PERMISSIONS)
+        }
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray)
+    {
+        if (requestCode == REQUEST_CODE_PERMISSIONS)
+        {
+            if (allPermissionsGranted())
+            {
+                initializeKeyOperation()
+            }
+            else
+            {
+                finish()
+            }
+        }
+    }
 
+    private fun initializeKeyOperation()
+    {
         setKeyCallback(object : KeyCallback {
             override fun onKeyDown(keyCode: Int, event: KeyEvent?) {
 
@@ -83,6 +125,7 @@ class MainActivity : PluginActivity(), IBluetoothScanResult, IDetectSensingRecei
         updateStatus(applicationStatus.status)
     }
 
+
     // Bluetooth SPPで EEGに接続する
     private fun connectToEEG()
     {