Feature omniring

app/src/main/AndroidManifest.xml

@@ -51,26 +51,38 @@
     <!-- required on android 13 -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
-    <!-- Bluetooth -->
     <!-- Request legacy Bluetooth permissions on older devices. -->
-    <uses-permission android:name="android.permission.BLUETOOTH"
+    <uses-permission
+        android:name="android.permission.BLUETOOTH"
         android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_ADMIN"
         android:maxSdkVersion="30" />
-
-    <!-- Needed only if your app looks for Bluetooth devices. -->
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
-    <!-- Needed only if your app communicates with already-paired Bluetooth devices. - it looks like this is more broad, some call we make requires it. -->
+    <!--
+ Needed only if your app communicates with already-paired Bluetooth
+         devices.
+    -->
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <!-- Needed only if your app makes the device discoverable to Bluetooth devices.  This might be incorrect... -->
-    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
-
+    <!--
+ Include "neverForLocation" only if you can strongly assert that
+         your app never derives physical location from Bluetooth scan results.
+    -->
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation" /> <!-- This app is using bluetooth features but not required. -->
+    <uses-feature
+        android:name="android.hardware.bluetooth"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.bluetooth_le"
+        android:required="false" />
 
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="${appName}${appNameSuffix}"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true">
 
         <!-- ACTIVITIES -->
 
@@ -162,6 +174,10 @@
             </intent-filter>
         </service>
 
+        <service
+            android:name=".listeners.OmniringListener"
+            android:exported="false" />
+
         <!-- RECEIVERS -->
 
         <receiver android:name=".listeners.BootListener"

app/src/main/java/org/beiwe/app/PermissionHandler.kt

@@ -243,6 +243,11 @@ object PermissionHandler {
         return PersistentData.getBluetoothEnabled() && checkBluetoothPermissions(context)
     }
 
+    @JvmStatic
+    fun confirmOmniRing(context: Context): Boolean {
+        return PersistentData.getOmniRingEnabled() && checkBluetoothPermissions(context)
+    }
+
     @JvmStatic
     fun confirmAmbientAudioCollection(context: Context): Boolean {
         return PersistentData.getAmbientAudioEnabled() && checkAccessRecordAudio(context)
@@ -264,7 +269,7 @@ object PermissionHandler {
             if (!checkAccessCoarseLocation(context)) return Manifest.permission.ACCESS_COARSE_LOCATION
             if (!checkAccessFineLocation(context)) return Manifest.permission.ACCESS_FINE_LOCATION
         }
-        if (PersistentData.getBluetoothEnabled()) {
+        if (PersistentData.getBluetoothEnabled() || PersistentData.getOmniRingEnabled()) {
             // android versions below 12 use permission.BLUETOOTH and permission.BLUETOOTH_ADMIN,
             // 12+ uses permission.BLUETOOTH_CONNECT and permission.BLUETOOTH_SCAN
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
@@ -361,6 +366,8 @@ object PermissionHandler {
         permissions.put("most_recent_ambient_audio_stop", PersistentData.ambientAudioStop)
         permissions.put("most_recent_bluetooth_start", PersistentData.bluetoothStart)
         permissions.put("most_recent_bluetooth_stop", PersistentData.bluetoothStop)
+        permissions.put("most_recent_omniring_start", PersistentData.omniringStart)
+        permissions.put("most_recent_omniring_stop", PersistentData.omniringStop)
         permissions.put("most_recent_gps_start", PersistentData.gpsStart)
         permissions.put("most_recent_gps_stop", PersistentData.gpsStop)
         permissions.put("most_recent_gyroscope_start", PersistentData.gyroscopeStart)

app/src/main/java/org/beiwe/app/Timer.kt

@@ -33,6 +33,8 @@ class Timer(mainService: MainService) {
         lateinit var gyroscopeOnIntent: Intent
         lateinit var bluetoothOffIntent: Intent
         lateinit var bluetoothOnIntent: Intent
+        lateinit var omniRingOffIntent: Intent
+        lateinit var omniRingOnIntent: Intent
 
         lateinit var gpsOffIntent: Intent
         lateinit var gpsOnIntent: Intent
@@ -77,6 +79,8 @@ class Timer(mainService: MainService) {
         gyroscopeOnIntent = setupIntent(appContext.getString(R.string.turn_gyroscope_on))
         bluetoothOffIntent = setupIntent(appContext.getString(R.string.turn_bluetooth_off))
         bluetoothOnIntent = setupIntent(appContext.getString(R.string.turn_bluetooth_on))
+        omniRingOffIntent = setupIntent(appContext.getString(R.string.turn_omniring_off))
+        omniRingOnIntent = setupIntent(appContext.getString(R.string.turn_omniring_on))
         gpsOffIntent = setupIntent(appContext.getString(R.string.turn_gps_off))
         gpsOnIntent = setupIntent(appContext.getString(R.string.turn_gps_on))
 

app/src/main/java/org/beiwe/app/listeners/BluetoothListener.kt

@@ -6,7 +6,6 @@ import android.bluetooth.BluetoothAdapter.LeScanCallback
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.util.Log
 import org.beiwe.app.storage.EncryptionEngine
 import org.beiwe.app.storage.PersistentData
@@ -97,9 +96,9 @@ class BluetoothListener : BroadcastReceiver() {
         // this check was incorrect for 13 months, however bonded devices are not the same as connected devices.
         // This check was never relevent before (nobody ever noticed), so now we are just removing the check entirely.
         // If we want to implement more bluetooth safety checks, see http://stackoverflow.com/questions/3932228/list-connected-bluetooth-devices
-		// if ( bluetoothAdapter.getBondedDevices().isEmpty() ) {
-		// 	Log.d("BluetoothListener", "found a bonded bluetooth device, will not be turning off bluetooth.");
-		// 	externalBluetoothState = true; }
+        // if ( bluetoothAdapter.getBondedDevices().isEmpty() ) {
+        // 	Log.d("BluetoothListener", "found a bonded bluetooth device, will not be turning off bluetooth.");
+        // 	externalBluetoothState = true; }
 
         if (!externalBluetoothState) { // if the outside world and us agree that it should be off, turn it off
             bluetoothAdapter!!.disable()
@@ -159,7 +158,7 @@ class BluetoothListener : BroadcastReceiver() {
         Log.i("BluetoothListener", "disable BLE scan.")
         scanActive = false
         bluetoothAdapter!!.stopLeScan(bluetoothCallback)
-        disableBluetooth()
+//        disableBluetooth()
     }
 
     /** Intelligently ACTUALLY STARTS a Bluetooth LE scan.
@@ -183,7 +182,8 @@ class BluetoothListener : BroadcastReceiver() {
     @SuppressLint("NewApi")
     private val bluetoothCallback = LeScanCallback { device, rssi, scanRecord ->
         TextFileManager.getBluetoothLogFile().writeEncrypted(
-                System.currentTimeMillis().toString() + "," + EncryptionEngine.hashMAC(device.toString()) + "," + rssi
+            System.currentTimeMillis()
+                .toString() + "," + EncryptionEngine.hashMAC(device.toString()) + "," + rssi
         )
         // Log.i("Bluetooth",  System.currentTimeMillis() + "," + device.toString() + ", " + rssi )
     }