Add WearOS companion app

.gitignore

@@ -19,6 +19,8 @@
 /app/*.log
 /app/build
 /app/release
+/wear/build
+/wear/release
 /.idea/*
 !/.idea/icon.svg
 # Bundle

app/src/main/AndroidManifest.xml

@@ -13,6 +13,11 @@
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23" />
 
     <uses-feature
@@ -223,5 +228,10 @@
                 <action android:name="android.service.controls.ControlsProviderService" />
             </intent-filter>
         </service>
+
+        <service
+            android:name=".wearos.BluetoothServerService"
+            android:exported="false"
+            android:foregroundServiceType="connectedDevice" />
     </application>
 </manifest>

app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java

@@ -1,8 +1,10 @@
 package protect.card_locker;
 
 import android.app.Application;
+import android.content.Intent;
 
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.content.ContextCompat;
 
 import org.acra.ACRA;
 import org.acra.config.CoreConfigurationBuilder;
@@ -11,6 +13,7 @@
 import org.acra.data.StringFormat;
 
 import protect.card_locker.preferences.Settings;
+import protect.card_locker.wearos.BluetoothServerService;
 
 public class LoyaltyCardLockerApplication extends Application {
 
@@ -41,5 +44,13 @@ public void onCreate() {
         // Set theme
         Settings settings = new Settings(this);
         AppCompatDelegate.setDefaultNightMode(settings.getTheme());
+
+        // Start Bluetooth server for Wear OS companion if enabled
+        if (settings.getWearSyncEnabled() &&
+            ContextCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT)
+                == android.content.pm.PackageManager.PERMISSION_GRANTED
+        ) {
+            startService(new Intent(this, BluetoothServerService.class));
+        }
     }
 }

app/src/main/java/protect/card_locker/MainActivity.kt

@@ -467,11 +467,7 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
         ShortcutHelper.updateShortcuts(mAdapter.mContext)
     }
 
-    private fun processParseResultList(
-        parseResultList: MutableList<ParseResult?>,
-        group: String?,
-        closeAppOnNoBarcode: Boolean
-    ) {
+    private fun processParseResultList(parseResultList: MutableList<ParseResult?>) {
         require(!parseResultList.isEmpty()) { "parseResultList may not be empty" }
 
         Utils.makeUserChooseParseResultFromList(
@@ -482,17 +478,12 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
                     val intent =
                         Intent(applicationContext, LoyaltyCardEditActivity::class.java)
                     val bundle = parseResult.toLoyaltyCardBundle(this@MainActivity)
-                    if (group != null) {
-                        bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group)
-                    }
                     intent.putExtras(bundle)
                     startActivity(intent)
                 }
 
                 override fun onUserDismissedSelector() {
-                    if (closeAppOnNoBarcode) {
-                        finish()
-                    }
+                    finish()
                 }
             })
     }
@@ -556,7 +547,7 @@ class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
             return
         }
 
-        processParseResultList(parseResultList, null, true)
+        processParseResultList(parseResultList)
     }
 
     private fun extractIntentFields(intent: Intent) {

app/src/main/java/protect/card_locker/NotificationInfo.kt

@@ -0,0 +1,8 @@
+package protect.card_locker
+
+object NotificationInfo {
+    object WearBluetooth {
+        const val NOTIFICATION_ID = 1001
+        const val CHANNEL_ID = "catima_wear_bt"
+    }
+}

app/src/main/java/protect/card_locker/preferences/Settings.java

@@ -112,4 +112,8 @@ public int getPreferredColumnCount() {
     public boolean useVolumeKeysForNavigation() {
         return getBoolean(R.string.settings_key_use_volume_keys_navigation, false);
     }
+
+    public boolean getWearSyncEnabled() {
+        return getBoolean(R.string.settings_key_wear_sync, false);
+    }
 }

app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt

@@ -1,22 +1,26 @@
 package protect.card_locker.preferences
 
-import android.app.Activity
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.activity.OnBackPressedCallback
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.ContextCompat
 import androidx.core.os.LocaleListCompat
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreferenceCompat
 import protect.card_locker.BuildConfig
 import protect.card_locker.CatimaAppCompatActivity
 import protect.card_locker.MainActivity
 import protect.card_locker.R
 import protect.card_locker.Utils
 import protect.card_locker.databinding.SettingsActivityBinding
+import protect.card_locker.wearos.BluetoothServerService
 
 class SettingsActivity : CatimaAppCompatActivity() {
 
@@ -81,6 +85,25 @@ class SettingsActivity : CatimaAppCompatActivity() {
     class SettingsFragment : PreferenceFragmentCompat() {
         var mReloadMain: Boolean = false
 
+        private val mBtPermissionLauncher = registerForActivityResult(
+            ActivityResultContracts.RequestPermission()
+        ) { granted ->
+            if (granted && Settings(requireContext()).wearSyncEnabled) {
+                requireContext().startService(Intent(requireContext(), BluetoothServerService::class.java))
+            }
+        }
+
+        override fun onResume() {
+            super.onResume()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+                Settings(requireContext()).wearSyncEnabled &&
+                ContextCompat.checkSelfPermission(requireContext(), android.Manifest.permission.BLUETOOTH_CONNECT)
+                    != PackageManager.PERMISSION_GRANTED
+            ) {
+                mBtPermissionLauncher.launch(android.Manifest.permission.BLUETOOTH_CONNECT)
+            }
+        }
+
         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
             // Load the preferences from an XML resource
             addPreferencesFromResource(R.xml.preferences)
@@ -104,7 +127,7 @@ class SettingsActivity : CatimaAppCompatActivity() {
 
             val oledDarkPreference = findPreference<Preference>(getString(R.string.settings_key_oled_dark))
             oledDarkPreference!!.setOnPreferenceChangeListener { _, _ ->
-                refreshActivity(true)
+                refreshActivity()
                 true
             }
 
@@ -148,7 +171,7 @@ class SettingsActivity : CatimaAppCompatActivity() {
             localePreference.setOnPreferenceChangeListener { _, newValue ->
                 // See corresponding comment in Utils.updateBaseContextLocale for Android 6- notes
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-                    refreshActivity(true)
+                    refreshActivity()
                     return@setOnPreferenceChangeListener true
                 }
                 val newLocale = newValue as String
@@ -157,13 +180,32 @@ class SettingsActivity : CatimaAppCompatActivity() {
                 true
             }
 
+            val wearSyncPreference = findPreference<SwitchPreferenceCompat>(getString(R.string.settings_key_wear_sync))
+            wearSyncPreference!!.setOnPreferenceChangeListener { _, newValue ->
+                val enabled = newValue as Boolean
+                val ctx = requireContext()
+                if (enabled) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+                        ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.BLUETOOTH_CONNECT)
+                            != PackageManager.PERMISSION_GRANTED
+                    ) {
+                        mBtPermissionLauncher.launch(android.Manifest.permission.BLUETOOTH_CONNECT)
+                    } else {
+                        ctx.startService(Intent(ctx, BluetoothServerService::class.java))
+                    }
+                } else {
+                    ctx.stopService(Intent(ctx, BluetoothServerService::class.java))
+                }
+                true
+            }
+
             // Hide crash reporter settings on builds it's not enabled on
             val crashReporterPreference = findPreference<Preference>("acra.enable")
             crashReporterPreference!!.isVisible = BuildConfig.useAcraCrashReporter
         }
 
-        private fun refreshActivity(reloadMain: Boolean) {
-            mReloadMain = reloadMain || mReloadMain
+        private fun refreshActivity() {
+            mReloadMain = true
             activity?.recreate()
         }
     }