import NFC plugin (impoved UX & security)

Author: juehv

app/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <!-- Permission required to use the phone's NFC hardware -->
+    <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
@@ -64,14 +66,38 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
             android:name="app.aaps.activities.PreferencesActivity"
             android:exported="false"
             android:theme="@style/AppTheme" />
+        y
         <activity
             android:name="app.aaps.activities.HistoryBrowseActivity"
             android:exported="false"
             android:theme="@style/AppTheme" />
+
+        <!-- NfcControlActivity processes NFC tags with AAPS commands.
+             The device must be unlocked before the activity can run.
+             The intent filter limits it to tags with the specific MIME type. -->
+        <activity
+            android:name="app.aaps.plugins.main.general.nfcCommands.NfcControlActivity"
+            android:exported="true"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/vnd.app.aaps.command" />
+            </intent-filter>
+        </activity>
+
+        <!-- NfcBuildActivity: tag-command builder, launched from My Tags.
+             Not exported — only started by the app itself. -->
+        <activity
+            android:name="app.aaps.plugins.main.general.nfcCommands.NfcBuildActivity"
+            android:exported="false"
+            android:theme="@style/AppTheme" />
+
         <!-- Receive new BG readings from other local apps -->
         <receiver
             android:name="app.aaps.receivers.DataReceiver"

app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt

@@ -53,6 +53,7 @@ import app.aaps.core.validators.preferences.AdaptiveSwitchPreference
 import app.aaps.plugins.aps.autotune.AutotunePlugin
 import app.aaps.plugins.automation.AutomationPlugin
 import app.aaps.plugins.configuration.maintenance.MaintenancePlugin
+import app.aaps.plugins.main.general.nfcCommands.NfcCommandsPlugin
 import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
 import app.aaps.plugins.main.skins.SkinProvider
 import dagger.android.support.AndroidSupportInjection
@@ -73,6 +74,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var passwordCheck: PasswordCheck
     @Inject lateinit var automationPlugin: AutomationPlugin
     @Inject lateinit var autotunePlugin: AutotunePlugin
+    @Inject lateinit var nfcCommandsPlugin: NfcCommandsPlugin
     @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
     @Inject lateinit var maintenancePlugin: MaintenancePlugin
     @Inject lateinit var skinProvider: SkinProvider
@@ -150,6 +152,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             addPreferencesIfEnabled(activePlugin.activeInsulin as PluginBase, rootKey)
             activePlugin.getSpecificPluginsList(PluginType.SYNC).forEach { addPreferencesIfEnabled(it, rootKey) }
             addPreferencesIfEnabled(smsCommunicatorPlugin, rootKey)
+            addPreferencesIfEnabled(nfcCommandsPlugin, rootKey)
             addPreferencesIfEnabled(automationPlugin, rootKey)
             addPreferencesIfEnabled(autotunePlugin, rootKey)
             addAlertScreen(rootKey)

app/src/main/kotlin/app/aaps/di/PluginsListModule.kt

@@ -22,6 +22,7 @@ import app.aaps.plugins.insulin.InsulinOrefRapidActingPlugin
 import app.aaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin
 import app.aaps.plugins.main.general.actions.ActionsPlugin
 import app.aaps.plugins.main.general.food.FoodPlugin
+import app.aaps.plugins.main.general.nfcCommands.NfcCommandsPlugin
 import app.aaps.plugins.main.general.overview.OverviewPlugin
 import app.aaps.plugins.main.general.persistentNotification.PersistentNotificationPlugin
 import app.aaps.plugins.main.general.smsCommunicator.SmsCommunicatorPlugin
@@ -289,6 +290,12 @@ abstract class PluginsListModule {
     @IntKey(280)
     abstract fun bindSmsCommunicatorPlugin(plugin: SmsCommunicatorPlugin): PluginBase
 
+    @Binds
+    @NotNSClient
+    @IntoMap
+    @IntKey(285)
+    abstract fun bindNfcCommandsPlugin(plugin: NfcCommandsPlugin): PluginBase
+
     @Binds
     @APS
     @IntoMap
@@ -501,4 +508,4 @@ abstract class PluginsListModule {
 
     @Qualifier
     annotation class Unfinished
-}
+}

core/data/src/main/kotlin/app/aaps/core/data/ue/Sources.kt

@@ -68,6 +68,7 @@ enum class Sources {
     VirtualPump,
     Random,
     SMS,                //From SMS plugin
+    NfcCommands,        //From NFC Commands plugin
     Treatments,         //From Treatments plugin
     Wear,               //From Wear plugin
     Food,               //From Food plugin

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/logging/LTag.kt

@@ -15,6 +15,7 @@ enum class LTag(val tag: String, val defaultValue: Boolean = true, val requiresR
     GLUCOSE("GLUCOSE", defaultValue = false),
     HTTP("HTTP"),
     LOCATION("LOCATION"),
+    NFC("NFC"),
     NOTIFICATION("NOTIFICATION"),
     NSCLIENT("NSCLIENT"),
     OHUPLOADER("OHUPLOADER"),
@@ -30,4 +31,4 @@ enum class LTag(val tag: String, val defaultValue: Boolean = true, val requiresR
     WIDGET("WIDGET"),
     WORKER("WORKER"),
     XDRIP("XDRIP")
-}
+}

core/keys/src/main/kotlin/app/aaps/core/keys/BooleanKey.kt

@@ -76,6 +76,8 @@ enum class BooleanKey(
     SmsAllowRemoteCommands("smscommunicator_remotecommandsallowed", false),
     SmsReportPumpUnreachable("smscommunicator_report_pump_unreachable", true),
 
+    NfcAllowRemoteCommands("nfccommunicator_remotecommandsallowed", false),
+
     VirtualPumpStatusUpload("virtualpump_uploadstatus", false, showInNsClientMode = false),
     NsClientUploadData("ns_upload", true, showInNsClientMode = false, hideParentScreenIfHidden = true),
     NsClientAcceptCgmData("ns_receive_cgm", false, showInNsClientMode = false, hideParentScreenIfHidden = true),
@@ -129,4 +131,4 @@ enum class BooleanKey(
     ExportCsvLocalEnabled("export_csv_local_enabled", defaultValue = true),
     ExportCsvCloudEnabled("export_csv_cloud_enabled", defaultValue = false),
 
-}
+}

core/objects/src/main/res/drawable/ic_nfc.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,20L4,20L4,4h16v16zM18,6h-5c-1.1,0 -2,0.9 -2,2v2.28c-0.6,0.35 -1,0.98 -1,1.72 0,1.1 0.9,2 2,2s2,-0.9 2,-2c0,-0.74 -0.4,-1.38 -1,-1.72L13,8h3v8L8,16L8,8h2L10,6L6,6v12h12L18,6z"/>
+</vector>

database/impl/src/main/kotlin/app/aaps/database/entities/UserEntry.kt

@@ -187,6 +187,7 @@ data class UserEntry(
         VirtualPump,
         Random,
         SMS,                //From SMS plugin
+        NfcCommands,        //From NFC Commands plugin
         Treatments,         //From Treatments plugin
         Wear,               //From Wear plugin
         Food,               //From Food plugin

database/persistence/src/main/kotlin/app/aaps/database/persistence/converters/SourcesExtension.kt

@@ -72,6 +72,7 @@ fun UserEntry.Sources.fromDb(): Sources =
         UserEntry.Sources.VirtualPump         -> Sources.VirtualPump
         UserEntry.Sources.Random              -> Sources.Random
         UserEntry.Sources.SMS                 -> Sources.SMS
+        UserEntry.Sources.NfcCommands         -> Sources.NfcCommands
         UserEntry.Sources.Treatments          -> Sources.Treatments
         UserEntry.Sources.Wear                -> Sources.Wear
         UserEntry.Sources.Food                -> Sources.Food
@@ -154,6 +155,7 @@ fun Sources.toDb(): UserEntry.Sources =
         Sources.VirtualPump         -> UserEntry.Sources.VirtualPump
         Sources.Random              -> UserEntry.Sources.Random
         Sources.SMS                 -> UserEntry.Sources.SMS
+        Sources.NfcCommands         -> UserEntry.Sources.NfcCommands
         Sources.Treatments          -> UserEntry.Sources.Treatments
         Sources.Wear                -> UserEntry.Sources.Wear
         Sources.Food                -> UserEntry.Sources.Food

implementation/src/main/kotlin/app/aaps/implementation/userEntry/UserEntryPresentationHelperImpl.kt

@@ -108,6 +108,7 @@ class UserEntryPresentationHelperImpl @Inject constructor(
         Sources.MDI                 -> R.drawable.ic_ict
         Sources.VirtualPump         -> R.drawable.ic_virtual_pump
         Sources.SMS                 -> R.drawable.ic_sms
+        Sources.NfcCommands         -> R.drawable.ic_nfc
         Sources.Treatments          -> R.drawable.ic_treatments
         Sources.Wear                -> R.drawable.ic_watch
         Sources.Food                -> R.drawable.ic_food