From 61db0cd16076023d75ff38f5f9e885dae3de3ce4 Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Wed, 30 Nov 2022 22:32:43 +0100
Subject: [PATCH] combov2: Fix pairing activity in pumpcontrol application

Adding a ComboV2PairingActivity Intent to the pairing Preferences within
the XML causes pumpcontrol builds to crash because of the different
package name prefix. Fix by adding the Intent in the preprocessPreferences
function instead.

Also fix the manifest and remove unnecessary package prefixes.

Fixes https://github.com/nightscout/AndroidAPS/issues/2236 .

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
---
 pump/combov2/src/main/AndroidManifest.xml                    | 5 ++---
 .../kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt     | 3 +++
 .../combov2/src/main/res/layout/combov2_pairing_activity.xml | 2 +-
 pump/combov2/src/main/res/xml/pref_combov2.xml               | 3 ---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pump/combov2/src/main/AndroidManifest.xml b/pump/combov2/src/main/AndroidManifest.xml
index d83e5ddd6d..b7420b34af 100644
--- a/pump/combov2/src/main/AndroidManifest.xml
+++ b/pump/combov2/src/main/AndroidManifest.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="info.nightscout.androidaps.plugins.pump.combov2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
     <application>
         <activity
-            android:name="info.nightscout.pump.combov2.activities.ComboV2PairingActivity"
+            android:name=".activities.ComboV2PairingActivity"
             android:exported="false"
             android:theme="@style/AppTheme.NoActionBar" />
     </application>
diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
index 75fac0b0c2..53d767b6d1 100644
--- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
+++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
@@ -44,6 +44,7 @@ import info.nightscout.interfaces.queue.CommandQueue
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.interfaces.utils.DecimalFormatter
 import info.nightscout.interfaces.utils.TimeChangeType
+import info.nightscout.pump.combov2.activities.ComboV2PairingActivity
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventDismissNotification
 import info.nightscout.rx.events.EventInitializationChanged
@@ -326,6 +327,8 @@ class ComboV2Plugin @Inject constructor (
                     val pairPref: Preference? = findPreference(rh.gs(R.string.key_combov2_pair_with_pump))
                     val unpairPref: Preference? = findPreference(rh.gs(R.string.key_combov2_unpair_pump))
 
+                    pairPref?.intent = Intent(activity, ComboV2PairingActivity::class.java)
+
                     val isInitiallyPaired = pairedStateUIFlow.value
                     pairPref?.isEnabled = !isInitiallyPaired
                     unpairPref?.isEnabled = isInitiallyPaired
diff --git a/pump/combov2/src/main/res/layout/combov2_pairing_activity.xml b/pump/combov2/src/main/res/layout/combov2_pairing_activity.xml
index 83b88bd19e..960e9ccb5d 100644
--- a/pump/combov2/src/main/res/layout/combov2_pairing_activity.xml
+++ b/pump/combov2/src/main/res/layout/combov2_pairing_activity.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        tools:context=".plugins.pump.combov2.activities.ComboV2PairingActivity">
+        tools:context=".activities.ComboV2PairingActivity">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/header"
diff --git a/pump/combov2/src/main/res/xml/pref_combov2.xml b/pump/combov2/src/main/res/xml/pref_combov2.xml
index 952fb7ae2c..9db6d53212 100644
--- a/pump/combov2/src/main/res/xml/pref_combov2.xml
+++ b/pump/combov2/src/main/res/xml/pref_combov2.xml
@@ -12,9 +12,6 @@
             android:title="@string/combov2_pair_with_pump_title"
             android:summary="@string/combov2_pair_with_pump_summary"
             android:shouldDisableView="true">
-            <intent
-                android:targetClass="info.nightscout.pump.combov2.activities.ComboV2PairingActivity"
-                android:targetPackage="info.nightscout.androidaps" />
         </Preference>
 
         <Preference