From d4a505098e93dca0a064ae59b91d558470861ce5 Mon Sep 17 00:00:00 2001 From: Markus Friedli Date: Sat, 28 Sep 2024 16:01:53 +0200 Subject: [PATCH] Bump target sdk from 34 to 35 (#603) --- README.md | 2 +- app/build.gradle | 2 +- .../android/pikettassist/service/BogusAlarmWorker.java | 6 +++--- .../android/pikettassist/service/LowSignalWorker.java | 5 ++--- .../android/pikettassist/service/PikettWorker.java | 3 +-- .../pikettassist/service/ReScheduledWorker.java | 4 ++-- .../android/pikettassist/service/TestAlarmWorker.java | 5 ++--- .../android/pikettassist/ui/alerts/AlertActivity.java | 2 -- .../pikettassist/ui/common/AbstractAlarmActivity.java | 10 ++++------ .../android/pikettassist/ui/overview/PartnerState.java | 4 ++-- .../pikettassist/ui/signal/LowSignalAlarmActivity.java | 4 +--- .../ui/testalarm/MissingTestAlarmAlarmActivity.java | 5 ++--- 12 files changed, 21 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 3f4b02b0..75b751db 100644 --- a/README.md +++ b/README.md @@ -353,7 +353,7 @@ Any warranty claims are excluded. ## Development PAssist is developed with [Android-Studio][android-studio] with Java 17. The current Android target -SDK is 34 (Android 14-UpsideDownCake) and the minimal SDK is 26 (Android 8.0-Oreo). +SDK is 35 (Android 15-VanillaIceCream) and the minimal SDK is 26 (Android 8.0-Oreo). ## Used libraries diff --git a/app/build.gradle b/app/build.gradle index bc8e7ae5..344b08df 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,7 +37,7 @@ android { defaultConfig { applicationId "com.github.frimtec.android.pikettassist" minSdkVersion 26 - targetSdkVersion 34 + targetSdkVersion 35 versionCode vcode versionName vname testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/github/frimtec/android/pikettassist/service/BogusAlarmWorker.java b/app/src/main/java/com/github/frimtec/android/pikettassist/service/BogusAlarmWorker.java index 2bf40f58..53eed756 100644 --- a/app/src/main/java/com/github/frimtec/android/pikettassist/service/BogusAlarmWorker.java +++ b/app/src/main/java/com/github/frimtec/android/pikettassist/service/BogusAlarmWorker.java @@ -44,11 +44,11 @@ protected JobService getJobService() { } @Override - protected WorkUnit geServiceWorkUnit(Context context, AlarmService alarmService) { + protected WorkUnit geServiceWorkUnit(Context context) { Map alarmTriggers = new EnumMap<>(AlarmType.class); alarmTriggers.put(AlarmType.ALERT, () -> AlertActivity.trigger(new Sms(SecureSmsProxyFacade.PHONE_NUMBER_LOOPBACK, "", null), context)); - alarmTriggers.put(AlarmType.LOW_SIGNAL, () -> LowSignalAlarmActivity.trigger(context, alarmService, false)); - alarmTriggers.put(AlarmType.MISSING_TEST_ALARM, () -> MissingTestAlarmAlarmActivity.trigger(context, alarmService)); + alarmTriggers.put(AlarmType.LOW_SIGNAL, () -> LowSignalAlarmActivity.trigger(context, false)); + alarmTriggers.put(AlarmType.MISSING_TEST_ALARM, () -> MissingTestAlarmAlarmActivity.trigger(context)); return new BogusAlarmWorkUnit(alarmTriggers); } diff --git a/app/src/main/java/com/github/frimtec/android/pikettassist/service/LowSignalWorker.java b/app/src/main/java/com/github/frimtec/android/pikettassist/service/LowSignalWorker.java index 4b5ba33c..a1817e52 100644 --- a/app/src/main/java/com/github/frimtec/android/pikettassist/service/LowSignalWorker.java +++ b/app/src/main/java/com/github/frimtec/android/pikettassist/service/LowSignalWorker.java @@ -13,7 +13,6 @@ import com.github.frimtec.android.pikettassist.action.JobService; import com.github.frimtec.android.pikettassist.service.dao.AlertDao; -import com.github.frimtec.android.pikettassist.service.system.AlarmService; import com.github.frimtec.android.pikettassist.service.system.InternetAvailabilityService; import com.github.frimtec.android.pikettassist.service.system.NotificationService; import com.github.frimtec.android.pikettassist.service.system.SignalStrengthService; @@ -33,7 +32,7 @@ protected JobService getJobService() { } @Override - protected WorkUnit geServiceWorkUnit(Context context, AlarmService alarmService) { + protected WorkUnit geServiceWorkUnit(Context context) { return new LowSignalWorkUnit( ApplicationPreferences.instance(), (AudioManager) context.getSystemService(Context.AUDIO_SERVICE), @@ -43,7 +42,7 @@ protected WorkUnit geServiceWorkUnit(Context context, AlarmService alarmService) new InternetAvailabilityService(context), new VolumeService(context), new NotificationService(context), - () -> LowSignalAlarmActivity.trigger(context, alarmService, true), + () -> LowSignalAlarmActivity.trigger(context, true), context ); } diff --git a/app/src/main/java/com/github/frimtec/android/pikettassist/service/PikettWorker.java b/app/src/main/java/com/github/frimtec/android/pikettassist/service/PikettWorker.java index 0c2ebb4d..6434cd67 100644 --- a/app/src/main/java/com/github/frimtec/android/pikettassist/service/PikettWorker.java +++ b/app/src/main/java/com/github/frimtec/android/pikettassist/service/PikettWorker.java @@ -10,7 +10,6 @@ import androidx.work.WorkerParameters; import com.github.frimtec.android.pikettassist.action.JobService; -import com.github.frimtec.android.pikettassist.service.system.AlarmService; import com.github.frimtec.android.pikettassist.service.system.NotificationService; import com.github.frimtec.android.pikettassist.service.system.VolumeService; import com.github.frimtec.android.pikettassist.state.ApplicationPreferences; @@ -28,7 +27,7 @@ protected JobService getJobService() { } @Override - protected WorkUnit geServiceWorkUnit(Context context, AlarmService alarmService) { + protected WorkUnit geServiceWorkUnit(Context context) { return new PikettWorkUnit( ApplicationState.instance(), ApplicationPreferences.instance(), diff --git a/app/src/main/java/com/github/frimtec/android/pikettassist/service/ReScheduledWorker.java b/app/src/main/java/com/github/frimtec/android/pikettassist/service/ReScheduledWorker.java index 1218e499..6cc82a5a 100644 --- a/app/src/main/java/com/github/frimtec/android/pikettassist/service/ReScheduledWorker.java +++ b/app/src/main/java/com/github/frimtec/android/pikettassist/service/ReScheduledWorker.java @@ -26,7 +26,7 @@ public ReScheduledWorker(@NonNull Context context, @NonNull WorkerParameters wor protected abstract JobService getJobService(); - protected abstract WorkUnit geServiceWorkUnit(Context context, AlarmService alarmService); + protected abstract WorkUnit geServiceWorkUnit(Context context); @NonNull @Override @@ -34,7 +34,7 @@ public Result doWork() { Data inputData = getInputData(); Context context = getApplicationContext(); AlarmService alarmService = new AlarmService(context); - Optional scheduleInfo = geServiceWorkUnit(context, alarmService).apply(inputData); + Optional scheduleInfo = geServiceWorkUnit(context).apply(inputData); JobService jobService = getJobService(); if (scheduleInfo.isPresent()) { alarmService.setAlarmForJob(scheduleInfo.get(), jobService); diff --git a/app/src/main/java/com/github/frimtec/android/pikettassist/service/TestAlarmWorker.java b/app/src/main/java/com/github/frimtec/android/pikettassist/service/TestAlarmWorker.java index 577481cb..9348beba 100644 --- a/app/src/main/java/com/github/frimtec/android/pikettassist/service/TestAlarmWorker.java +++ b/app/src/main/java/com/github/frimtec/android/pikettassist/service/TestAlarmWorker.java @@ -12,7 +12,6 @@ import com.github.frimtec.android.pikettassist.action.JobService; import com.github.frimtec.android.pikettassist.service.dao.TestAlarmDao; -import com.github.frimtec.android.pikettassist.service.system.AlarmService; import com.github.frimtec.android.pikettassist.service.system.NotificationService; import com.github.frimtec.android.pikettassist.state.ApplicationPreferences; import com.github.frimtec.android.pikettassist.ui.testalarm.MissingTestAlarmAlarmActivity; @@ -29,13 +28,13 @@ protected JobService getJobService() { } @Override - protected WorkUnit geServiceWorkUnit(Context context, AlarmService alarmService) { + protected WorkUnit geServiceWorkUnit(Context context) { return new TestAlarmWorkUnit( ApplicationPreferences.instance(), new TestAlarmDao(), new ShiftService(context), new NotificationService(context), - () -> MissingTestAlarmAlarmActivity.trigger(context, alarmService), + () -> MissingTestAlarmAlarmActivity.trigger(context), context ); } diff --git a/app/src/main/java/com/github/frimtec/android/pikettassist/ui/alerts/AlertActivity.java b/app/src/main/java/com/github/frimtec/android/pikettassist/ui/alerts/AlertActivity.java index 4b8b2bb6..37fcd64f 100644 --- a/app/src/main/java/com/github/frimtec/android/pikettassist/ui/alerts/AlertActivity.java +++ b/app/src/main/java/com/github/frimtec/android/pikettassist/ui/alerts/AlertActivity.java @@ -12,7 +12,6 @@ import com.github.frimtec.android.pikettassist.R; import com.github.frimtec.android.pikettassist.service.AlertService; -import com.github.frimtec.android.pikettassist.service.system.AlarmService; import com.github.frimtec.android.pikettassist.state.ApplicationPreferences; import com.github.frimtec.android.pikettassist.ui.common.AbstractAlarmActivity; import com.github.frimtec.android.pikettassist.util.GsonHelper; @@ -66,7 +65,6 @@ public static void trigger(Sms sms, Context context) { AbstractAlarmActivity.trigger( AlertActivity.class, context, - new AlarmService(context), singletonList(Pair.create(EXTRA_SMS, GsonHelper.GSON.toJson(sms))) ); } diff --git a/app/src/main/java/com/github/frimtec/android/pikettassist/ui/common/AbstractAlarmActivity.java b/app/src/main/java/com/github/frimtec/android/pikettassist/ui/common/AbstractAlarmActivity.java index 6b6e3a0e..d67354d5 100644 --- a/app/src/main/java/com/github/frimtec/android/pikettassist/ui/common/AbstractAlarmActivity.java +++ b/app/src/main/java/com/github/frimtec/android/pikettassist/ui/common/AbstractAlarmActivity.java @@ -1,6 +1,7 @@ package com.github.frimtec.android.pikettassist.ui.common; -import android.app.PendingIntent; +import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; + import android.content.Context; import android.content.Intent; import android.media.Ringtone; @@ -19,7 +20,6 @@ import com.github.frimtec.android.pikettassist.R; import com.github.frimtec.android.pikettassist.action.Action; -import com.github.frimtec.android.pikettassist.service.system.AlarmService; import com.github.frimtec.android.pikettassist.service.system.PowerService; import com.github.frimtec.android.pikettassist.service.system.VibrateService; import com.ncorti.slidetoact.SlideToActView; @@ -218,12 +218,10 @@ public void run() { protected static void trigger( Class activityClass, Context context, - AlarmService alarmService, List> extras) { Intent alarmIntent = new Intent(context, activityClass); + alarmIntent.setFlags(FLAG_ACTIVITY_NEW_TASK); extras.forEach(extra -> alarmIntent.putExtra(extra.first, extra.second)); - PendingIntent pendingIntent = PendingIntent.getActivity(context, - 1, alarmIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE); - alarmService.setAlarmForIntent(Duration.ofMillis(5), pendingIntent); + context.startActivity(alarmIntent); } } diff --git a/app/src/main/java/com/github/frimtec/android/pikettassist/ui/overview/PartnerState.java b/app/src/main/java/com/github/frimtec/android/pikettassist/ui/overview/PartnerState.java index a4ad31ee..8275da6d 100644 --- a/app/src/main/java/com/github/frimtec/android/pikettassist/ui/overview/PartnerState.java +++ b/app/src/main/java/com/github/frimtec/android/pikettassist/ui/overview/PartnerState.java @@ -11,13 +11,13 @@ import com.github.frimtec.android.pikettassist.domain.ContactPerson; import com.github.frimtec.android.pikettassist.ui.common.DialogHelper; -public class PartnerState extends State { +class PartnerState extends State { private final StateContext stateContext; private final ContactPerson partner; - public PartnerState(StateContext stateContext, ContactPerson partner) { + PartnerState(StateContext stateContext, ContactPerson partner) { super( R.drawable.ic_baseline_people_24, stateContext.getString(R.string.state_fragment_partner), diff --git a/app/src/main/java/com/github/frimtec/android/pikettassist/ui/signal/LowSignalAlarmActivity.java b/app/src/main/java/com/github/frimtec/android/pikettassist/ui/signal/LowSignalAlarmActivity.java index ff96d1a1..a22db7ca 100644 --- a/app/src/main/java/com/github/frimtec/android/pikettassist/ui/signal/LowSignalAlarmActivity.java +++ b/app/src/main/java/com/github/frimtec/android/pikettassist/ui/signal/LowSignalAlarmActivity.java @@ -7,7 +7,6 @@ import androidx.annotation.Nullable; import com.github.frimtec.android.pikettassist.R; -import com.github.frimtec.android.pikettassist.service.system.AlarmService; import com.github.frimtec.android.pikettassist.service.system.InternetAvailabilityService; import com.github.frimtec.android.pikettassist.service.system.SignalStrengthService; import com.github.frimtec.android.pikettassist.state.ApplicationPreferences; @@ -77,11 +76,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { this.autoClose.set(Boolean.parseBoolean(getIntent().getStringExtra(EXTRA_AUTO_CLOSE))); } - public static void trigger(Context context, AlarmService alarmService, boolean autoClose) { + public static void trigger(Context context, boolean autoClose) { AbstractAlarmActivity.trigger( LowSignalAlarmActivity.class, context, - alarmService, Collections.singletonList(Pair.create(EXTRA_AUTO_CLOSE, Boolean.toString(autoClose))) ); } diff --git a/app/src/main/java/com/github/frimtec/android/pikettassist/ui/testalarm/MissingTestAlarmAlarmActivity.java b/app/src/main/java/com/github/frimtec/android/pikettassist/ui/testalarm/MissingTestAlarmAlarmActivity.java index 987053a7..6566f8fe 100644 --- a/app/src/main/java/com/github/frimtec/android/pikettassist/ui/testalarm/MissingTestAlarmAlarmActivity.java +++ b/app/src/main/java/com/github/frimtec/android/pikettassist/ui/testalarm/MissingTestAlarmAlarmActivity.java @@ -9,7 +9,6 @@ import androidx.annotation.Nullable; import com.github.frimtec.android.pikettassist.R; -import com.github.frimtec.android.pikettassist.service.system.AlarmService; import com.github.frimtec.android.pikettassist.state.ApplicationPreferences; import com.github.frimtec.android.pikettassist.ui.common.AbstractAlarmActivity; @@ -42,8 +41,8 @@ private Uri getAlarmTone(Context context) { return RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM); } - public static void trigger(Context context, AlarmService alarmService) { - AbstractAlarmActivity.trigger(MissingTestAlarmAlarmActivity.class, context, alarmService, Collections.emptyList()); + public static void trigger(Context context) { + AbstractAlarmActivity.trigger(MissingTestAlarmAlarmActivity.class, context, Collections.emptyList()); } } \ No newline at end of file