mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-17 14:10:54 +02:00
Code Issues Releases Wiki Activity

added mutable flags for Android 12, see #791

Browse Source
This commit is contained in:
oliexdev
2021-11-15 09:32:27 +01:00
parent 49ae42b508
commit 9947c5b955
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android_app/app/build.gradle
View File

@@ -6,7 +6,7 @@ android {
defaultConfig { defaultConfig {
applicationId "com.health.openscale" applicationId "com.health.openscale"
testApplicationId "com.health.openscale.test" testApplicationId "com.health.openscale.test"
minSdkVersion 21 minSdkVersion 23
targetSdkVersion 31 targetSdkVersion 31
versionCode 58 versionCode 58
versionName "2.4.3" versionName "2.4.3"

2
android_app/app/src/main/java/com/health/openscale/core/alarm/AlarmBackupHandler.java
View File

@@ -75,7 +75,7 @@ public class AlarmBackupHandler
Intent alarmIntent = new Intent(context, ReminderBootReceiver.class); Intent alarmIntent = new Intent(context, ReminderBootReceiver.class);
alarmIntent.putExtra(INTENT_EXTRA_BACKUP_ALARM, true); alarmIntent.putExtra(INTENT_EXTRA_BACKUP_ALARM, true);
return PendingIntent.getBroadcast(context, ALARM_NOTIFICATION_ID, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT); return PendingIntent.getBroadcast(context, ALARM_NOTIFICATION_ID, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
} }
public void disableAlarm(Context context) { public void disableAlarm(Context context) {

11
android_app/app/src/main/java/com/health/openscale/core/alarm/AlarmHandler.java
View File

@@ -15,6 +15,8 @@
*/ */
package com.health.openscale.core.alarm; package com.health.openscale.core.alarm;
import static android.content.Context.NOTIFICATION_SERVICE;
import android.app.AlarmManager; import android.app.AlarmManager;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationChannel; import android.app.NotificationChannel;
@@ -25,6 +27,8 @@ import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.service.notification.StatusBarNotification; import android.service.notification.StatusBarNotification;
import androidx.core.app.NotificationCompat;
import com.health.openscale.R; import com.health.openscale.R;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.gui.MainActivity; import com.health.openscale.gui.MainActivity;
@@ -34,11 +38,8 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import androidx.core.app.NotificationCompat;
import timber.log.Timber; import timber.log.Timber;
import static android.content.Context.NOTIFICATION_SERVICE;
public class AlarmHandler public class AlarmHandler
{ {
public static final String INTENT_EXTRA_ALARM = "alarmIntent"; public static final String INTENT_EXTRA_ALARM = "alarmIntent";
@@ -116,7 +117,7 @@ public class AlarmHandler
Intent alarmIntent = new Intent(context, ReminderBootReceiver.class); Intent alarmIntent = new Intent(context, ReminderBootReceiver.class);
alarmIntent.putExtra(INTENT_EXTRA_ALARM, true); alarmIntent.putExtra(INTENT_EXTRA_ALARM, true);
return PendingIntent.getBroadcast(context, dayOfWeek, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT); return PendingIntent.getBroadcast(context, dayOfWeek, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
} }
public void disableAllAlarms(Context context) public void disableAllAlarms(Context context)
@@ -156,7 +157,7 @@ public class AlarmHandler
Intent notifyIntent = new Intent(context, MainActivity.class); Intent notifyIntent = new Intent(context, MainActivity.class);
PendingIntent notifyPendingIntent = PendingIntent notifyPendingIntent =
PendingIntent.getActivity(context, 0, notifyIntent, PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent.getActivity(context, 0, notifyIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context, "openScale_notify"); NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context, "openScale_notify");

2
android_app/app/src/main/java/com/health/openscale/gui/widget/WidgetProvider.java
View File

@@ -144,7 +144,7 @@ public class WidgetProvider extends AppWidgetProvider {
// Start main activity when widget is clicked // Start main activity when widget is clicked
Intent intent = new Intent(context, MainActivity.class); Intent intent = new Intent(context, MainActivity.class);
PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0); PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE);
views.setOnClickPendingIntent(R.id.widget_layout, pendingIntent); views.setOnClickPendingIntent(R.id.widget_layout, pendingIntent);
appWidgetManager.updateAppWidget(appWidgetId, views); appWidgetManager.updateAppWidget(appWidgetId, views);