Restore more formatting

app/src/main/AndroidManifest.xml

@@ -54,7 +54,6 @@
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -231,11 +230,11 @@
         <service
             android:name=".plugins.general.nsclient.services.NSClientService"
             android:enabled="true"
-            android:exported="false" />
+            android:exported="true" />
         <service
             android:name=".services.AlarmSoundService"
             android:enabled="true"
-            android:exported="false" />
+            android:exported="true" />
         <service
             android:name=".plugins.general.overview.notifications.DismissNotificationService"
             android:exported="false" />
@@ -298,6 +297,8 @@
             android:theme="@style/Theme.AppCompat.NoTitle" />
         <activity android:name=".plugins.pump.medtronic.dialog.MedtronicHistoryActivity" />
 
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
         <!-- Omnipod service and activities -->
         <service
             android:name=".plugins.pump.omnipod.service.RileyLinkOmnipodService"

app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt

@@ -18,8 +18,6 @@ class ErrorHelperActivity : DialogAppCompatActivity() {
         errorDialog.status = intent.getStringExtra("status")
         errorDialog.sound = intent.getIntExtra("soundid", R.raw.error)
         errorDialog.title = intent.getStringExtra("title")
-        //if (intent.hasExtra("clipboardContent"))
-        //    errorDialog.clipboardContent = intent.getStringExtra("clipboardContent")
         errorDialog.show(supportFragmentManager, "Error")
 
         if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {

app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt

@@ -353,4 +353,4 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
         }
         return super.onPreferenceTreeClick(preference)
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt

@@ -83,4 +83,4 @@ interface AppComponent : AndroidInjector<MainApp> {
 
         fun build(): AppComponent
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt

@@ -122,4 +122,4 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesRileyLinkStatusGeneral(): RileyLinkStatusGeneralFragment
     @ContributesAndroidInjector abstract fun contributesRileyLinkStatusHistoryFragment(): RileyLinkStatusHistoryFragment
     @ContributesAndroidInjector abstract fun contributesRileyLinkStatusDeviceMedtronic(): RileyLinkStatusDeviceMedtronic
-}
+}

app/src/main/java/info/nightscout/androidaps/events/EventBTChange.kt

@@ -6,4 +6,4 @@ class EventBTChange(val state: Change, val deviceName: String?, val deviceAddres
         CONNECT,
         DISCONNECT
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt

@@ -113,4 +113,4 @@ class ProfileFunctionImplementation @Inject constructor(
         profileSwitch.percentage = percentage
         return profileSwitch
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt

@@ -280,4 +280,4 @@ class ActionsFragment : DaggerFragment() {
         for (customButton in pumpCustomButtons) action_buttons_layout?.removeView(customButton)
         pumpCustomButtons.clear()
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.kt

@@ -133,4 +133,4 @@ class CareportalFragment : DaggerFragment(), View.OnClickListener {
     private fun updateGUI() {
         statusLightHandler.updateStatusLights(careportal_canulaage, careportal_insulinage, null, careportal_sensorage, careportal_pbage, null)
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt

@@ -237,4 +237,4 @@ class NSSettingsStatus @Inject constructor(
         if (context != null) OKDialog.showConfirmation(context, resourceHelper.gs(R.string.statuslights), resourceHelper.gs(R.string.copyexistingvalues), action)
         else action.run()
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt

@@ -876,4 +876,4 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             }
         }
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt

@@ -57,4 +57,4 @@ class StatusLightHandler @Inject constructor(
         view?.text = " " + DecimalFormatter.to0Decimal(level) + units
         warnColors.setColorInverse(view, level, resWarn, resUrgent)
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt

@@ -76,4 +76,4 @@ class NotificationWithAction constructor(
         this.action = action
     }
 
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java

@@ -919,4 +919,4 @@ public class IobCobCalculatorPlugin extends PluginBase {
         if (upper >= arr.length) return arr[(int) lower];
         return arr[(int) lower] * (1 - weight) + arr[(int) upper] * weight;
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.kt

@@ -79,4 +79,4 @@ class MsgStatusTempBasal(
             }
         }
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt

@@ -104,4 +104,4 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, injector,0))
         put(DanaRS_Packet_APS_Set_Event_History(aapsLogger, 0, 0, 0, 0))
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt

@@ -200,4 +200,4 @@ open class DanaRS_Packet_APS_History_Events(
     override fun getFriendlyName(): String {
         return "APS_HISTORY_EVENTS"
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt

@@ -183,4 +183,4 @@ class MsgHistoryEvents_v2 constructor(
         if (datetime > danaRv2Plugin.lastEventTimeLoaded) danaRv2Plugin.lastEventTimeLoaded = datetime
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.processinghistory) + ": " + status))
     }
-}
+}

app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt

@@ -101,4 +101,4 @@ class TreatmentsPluginTest : TestBaseWithProfile() {
         val iob110pct = sot.getAbsoluteIOBTempBasals(now)
         Assert.assertEquals(1.1, iob110pct.iob / iob100pct.iob, 0.0001)
     }
-}
+}

core/src/main/java/info/nightscout/androidaps/utils/resources/ResourceHelperImplementation.kt

@@ -53,4 +53,4 @@ class ResourceHelperImplementation @Inject constructor(private val context: Cont
     }
 
     override fun shortTextMode() : Boolean = !gb(R.bool.isTablet)
-}
+}

core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SP.kt

@@ -37,4 +37,4 @@ interface SP {
     fun incInt(@StringRes resourceID: Int)
     fun putString(@StringRes resourceID: Int, value: String)
     fun putString(key: String, value: String)
-}
+}

core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt

@@ -129,4 +129,4 @@ class SPImplementation @Inject constructor(
     override fun putString(key: String, value: String) =
         sharedPreferences.edit().putString(key, value).apply()
 
-}
+}

gradle.properties

@@ -1,17 +1,23 @@
 # Project-wide Gradle settings.
+
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
+
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
+
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+
 org.gradle.jvmargs=-Xmx2g
-android.useAndroidX=true
+
-android.enableJetifier=true
+android.enableJetifier=true
+android.useAndroidX=true