compileSdk = 34
This commit is contained in:
Milos Kozak
parent
896acb94b5
commit
0153f47c12
|
|
@ -236,7 +236,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))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
android {
|
||||
compileSdk 33
|
||||
compileSdk 34
|
||||
defaultConfig {
|
||||
minSdkVersion 28
|
||||
targetSdkVersion 28
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ public abstract class SatlMessage {
|
|||
if (clazz == null) throw new InvalidSatlCommandException();
|
||||
SatlMessage message = null;
|
||||
try {
|
||||
message = clazz.newInstance();
|
||||
message = clazz.getDeclaredConstructor().newInstance();
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
message.parse(ByteBuf.from(payload));
|
||||
|
|
@ -137,7 +137,7 @@ public abstract class SatlMessage {
|
|||
if (clazz == null) throw new InvalidSatlCommandException();
|
||||
SatlMessage message = null;
|
||||
try {
|
||||
message = clazz.newInstance();
|
||||
message = clazz.getDeclaredConstructor().newInstance();
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
message.parse(ByteBuf.from(payload));
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -120,10 +120,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(mContext).toISOString(triggerTime)}")
|
||||
mOsAlarmManager.setAlarmClock(AlarmClockInfo(triggerTime, pendingIntent), pendingIntent)
|
||||
alarmCode
|
||||
createPendingIntent(alarmCode, 0)?.let { pendingIntent ->
|
||||
aapsLogger.debug("[${alarmCode}] OS Alarm added. ${DateUtil(mContext).toISOString(triggerTime)}")
|
||||
mOsAlarmManager.setAlarmClock(AlarmClockInfo(triggerTime, pendingIntent), pendingIntent)
|
||||
alarmCode
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ class TreatmentsActivity : TranslatedDaggerAppCompatActivity() {
|
|||
5 -> TreatmentsCareportalFragment::class.java
|
||||
else -> TreatmentsUserEntryFragment::class.java
|
||||
}
|
||||
setFragment(fragment.newInstance())
|
||||
setFragment(fragment.getDeclaredConstructor().newInstance())
|
||||
supportActionBar?.title = tab.contentDescription
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ def generateGitBuild = { ->
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdk 33
|
||||
compileSdk 34
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 25
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
Loading…
Reference in a new issue