caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'ns/compileSdk34' into dev

Browse source
This commit is contained in:
Milos Kozak 2023-09-24 14:58:24 +02:00
parent 31926f8835 bbea3712b1
commit 405fc985a8
14 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt
View file

@ -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))

2
build.gradle
View file

@ -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'

2
core/main/android_dependencies.gradle
View file

@ -1,5 +1,5 @@
android {
compileSdk 33
compileSdk 34
defaultConfig {
minSdkVersion 28
targetSdkVersion 28

2
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
View file

@ -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());

2
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/AppLayerMessage.java
View file

@ -57,7 +57,7 @@ public class AppLayerMessage implements Comparable<AppLayerMessage> {
Class<? extends AppLayerMessage> 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<? extends AppLayerErrorException> exceptionClass = AppErrorIDs.IDS.getType(error);

2
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/ReadParameterBlockMessage.java
View file

@ -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);
}

6
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
View file

@ -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<HistoryEvent> {
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();
}

8
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/satl/SatlMessage.java
View file

@ -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));

2
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPreference.kt
View file

@ -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)

2
plugins/sync/build.gradle
View file

@ -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"

9
pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt
View file

@ -125,10 +125,11 @@ class AlarmRegistry @Inject constructor() : IAlarmRegistry {
private fun registerOsAlarm(alarmCode: AlarmCode, triggerTime: Long): Maybe<AlarmCode> {
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
}
}
}

2
ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt
View file

@ -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
}

4
wear/build.gradle
View file

@ -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')

4
wear/src/main/java/info/nightscout/androidaps/WearApp.kt
View file

@ -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))