diff --git a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt index cff37f0d3f..78bb95402c 100644 --- a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt +++ b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt @@ -235,7 +235,8 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang if (filter != "") updateFilterVisibility(filter, preferenceScreen) } - override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) { + override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) { + key ?: return rxBus.send(EventPreferenceChange(key)) if (key == rh.gs(info.nightscout.core.ui.R.string.key_language)) { rxBus.send(EventRebuildTabs(true)) diff --git a/build.gradle b/build.gradle index 9a88953867..c6671d6542 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { fragmentktx_version = '1.6.1' ormLite_version = '4.46' gson_version = '2.10.1' - nav_version = '2.6.0' + nav_version = '2.7.0' appcompat_version = '1.6.1' material_version = '1.9.0' gridlayout_version = '1.0.0' diff --git a/core/main/android_dependencies.gradle b/core/main/android_dependencies.gradle index 4250b6d567..b89931830f 100644 --- a/core/main/android_dependencies.gradle +++ b/core/main/android_dependencies.gradle @@ -1,5 +1,5 @@ android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdkVersion 28 targetSdkVersion 28 diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java index 53208e5073..494851429e 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java @@ -40,7 +40,7 @@ public class InsightPairingInformationActivity extends DaggerAppCompatActivity { } else { serialNumber.setText(connectionService.getPumpSystemIdentification().getSerialNumber()); manufacturingDate.setText(connectionService.getPumpSystemIdentification().getManufacturingDate()); - systemIdAppendix.setText(connectionService.getPumpSystemIdentification().getSystemIdAppendix() + ""); + systemIdAppendix.setText(String.valueOf(connectionService.getPumpSystemIdentification().getSystemIdAppendix())); releaseSWVersion.setText(connectionService.getPumpFirmwareVersions().getReleaseSWVersion()); uiProcSWVersion.setText(connectionService.getPumpFirmwareVersions().getUiProcSWVersion()); pcProcSWVersion.setText(connectionService.getPumpFirmwareVersions().getPcProcSWVersion()); diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java index 7783abe063..f78a0a5171 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java @@ -57,7 +57,7 @@ public class AppLayerMessage implements Comparable { Class clazz = AppCommandIDs.IDS.getType(command); if (clazz == null) throw new UnknownAppCommandException(); if (version != VERSION) throw new IncompatibleAppVersionException(); - AppLayerMessage message = clazz.newInstance(); + AppLayerMessage message = clazz.getDeclaredConstructor().newInstance(); if (ServiceIDs.IDS.getType(service) == null) throw new UnknownServiceException(); if (error != 0) { Class exceptionClass = AppErrorIDs.IDS.getType(error); diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java index 221cf80462..8526fa2c27 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java @@ -33,7 +33,7 @@ public class ReadParameterBlockMessage extends AppLayerMessage { @Override protected void parse(ByteBuf byteBuf) throws Exception { - parameterBlock = ParameterBlockIDs.IDS.getType(byteBuf.readUInt16LE()).newInstance(); + parameterBlock = ParameterBlockIDs.IDS.getType(byteBuf.readUInt16LE()).getDeclaredConstructor().newInstance(); byteBuf.shift(2); //Restriction level parameterBlock.parse(byteBuf); } diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java index 200495fe41..a0ccf54566 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java @@ -1,5 +1,7 @@ package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events; +import java.lang.reflect.InvocationTargetException; + import info.nightscout.androidaps.plugins.pump.insight.ids.HistoryEventIDs; import info.nightscout.androidaps.plugins.pump.insight.utils.BOCUtil; import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf; @@ -22,8 +24,8 @@ public class HistoryEvent implements Comparable { if (eventClass == null) event = new HistoryEvent(); else { try { - event = eventClass.newInstance(); - } catch (IllegalAccessException | InstantiationException e) { + event = eventClass.getDeclaredConstructor().newInstance(); + } catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) { //log.error("Unhandled exception", e); event = new HistoryEvent(); } diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java index 37fcf60d86..7049a99687 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java @@ -107,8 +107,8 @@ public abstract class SatlMessage { if (clazz == null) throw new InvalidSatlCommandException(); SatlMessage message; try { - message = clazz.newInstance(); - } catch (Exception exception) { + message = clazz.getDeclaredConstructor().newInstance(); + } catch (Exception ignored) { throw new IllegalArgumentException(); } message.parse(ByteBuf.from(payload)); @@ -138,8 +138,8 @@ public abstract class SatlMessage { if (clazz == null) throw new InvalidSatlCommandException(); SatlMessage message; try { - message = clazz.newInstance(); - } catch (Exception exception) { + message = clazz.getDeclaredConstructor().newInstance(); + } catch (Exception ignored) { throw new IllegalArgumentException(); } message.parse(ByteBuf.from(payload)); diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPreference.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPreference.kt index ae42eabc36..308d6354c0 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPreference.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPreference.kt @@ -25,7 +25,7 @@ class SWPreference(injector: HasAndroidInjector, private val definition: SWDefin } private fun addConfiguration(layout: LinearLayout, xml: Int) { - (Class.forName(uiInteraction.myPreferenceFragment.name).newInstance() as Fragment).also { fragment -> + (Class.forName(uiInteraction.myPreferenceFragment.name).getDeclaredConstructor().newInstance() as Fragment).also { fragment -> fragment.arguments = Bundle().also { it.putInt("id", xml) } definition.activity.supportFragmentManager.beginTransaction().run { replace(layout.id, fragment) diff --git a/plugins/sync/build.gradle b/plugins/sync/build.gradle index c1f19c6934..d2696c0045 100644 --- a/plugins/sync/build.gradle +++ b/plugins/sync/build.gradle @@ -35,7 +35,7 @@ dependencies { // OpenHuman api "com.squareup.okhttp3:okhttp:$okhttp3_version" api "com.squareup.retrofit2:retrofit:$retrofit2_version" - api "androidx.browser:browser:1.5.0" + api "androidx.browser:browser:1.6.0" api "androidx.work:work-runtime-ktx:$work_version" api "com.google.android.material:material:$material_version" diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt index 83a7bd7503..782411acaf 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt @@ -125,10 +125,11 @@ class AlarmRegistry @Inject constructor() : IAlarmRegistry { private fun registerOsAlarm(alarmCode: AlarmCode, triggerTime: Long): Maybe { return Maybe.fromCallable { cancelOsAlarmInternal(alarmCode) - val pendingIntent = createPendingIntent(alarmCode, 0) - aapsLogger.debug("[${alarmCode}] OS Alarm added. ${dateUtil.toISOString(triggerTime)}") - mOsAlarmManager.setAlarmClock(AlarmClockInfo(triggerTime, pendingIntent), pendingIntent) - alarmCode + createPendingIntent(alarmCode, 0)?.let { pendingIntent -> + aapsLogger.debug("[${alarmCode}] OS Alarm added. ${dateUtil.toISOString(triggerTime)}") + mOsAlarmManager.setAlarmClock(AlarmClockInfo(triggerTime, pendingIntent), pendingIntent) + alarmCode + } } } diff --git a/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt index f2265aaaa4..e3094f251e 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt @@ -53,7 +53,7 @@ class TreatmentsActivity : TranslatedDaggerAppCompatActivity() { 5 -> TreatmentsCareportalFragment::class.java else -> TreatmentsUserEntryFragment::class.java } - setFragment(fragment.newInstance()) + setFragment(fragment.getDeclaredConstructor().newInstance()) supportActionBar?.title = tab.contentDescription } diff --git a/wear/build.gradle b/wear/build.gradle index 93024933f1..6f4c73c785 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -43,7 +43,7 @@ def generateGitBuild = { -> } android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdkVersion 25 @@ -103,7 +103,7 @@ dependencies { implementation 'androidx.legacy:legacy-support-v13:1.0.0' implementation "androidx.preference:preference-ktx:$preferencektx_version" implementation 'androidx.wear:wear:1.3.0' - implementation 'androidx.wear.tiles:tiles:1.1.0' + implementation 'androidx.wear.tiles:tiles:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' testImplementation project(':shared:tests') diff --git a/wear/src/main/java/info/nightscout/androidaps/WearApp.kt b/wear/src/main/java/info/nightscout/androidaps/WearApp.kt index d33ae5a89c..9eaf4983e9 100644 --- a/wear/src/main/java/info/nightscout/androidaps/WearApp.kt +++ b/wear/src/main/java/info/nightscout/androidaps/WearApp.kt @@ -21,6 +21,7 @@ class WearApp : DaggerApplication(), OnSharedPreferenceChangeListener { @Inject lateinit var aapsLogger: AAPSLogger @Inject lateinit var rxBus: RxBus + @Suppress("unused") @Inject lateinit var dataHandlerWear: DataHandlerWear // instantiate only @Inject lateinit var exceptionHandlerWear: ExceptionHandlerWear @@ -38,7 +39,8 @@ class WearApp : DaggerApplication(), OnSharedPreferenceChangeListener { .application(this) .build() - override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) { + override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) { + key ?: return // We trigger update on Complications LocalBroadcastManager.getInstance(this).sendBroadcast(Intent(DataLayerListenerServiceWear.INTENT_NEW_DATA)) rxBus.send(EventWearPreferenceChange(key))