gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue with crashes starting on Android 12 - Fixes #80

Browse Source
This commit is contained in:
Graham Jones
2023-05-31 20:04:12 +01:00
parent babfe74043
commit 36ba4e2f77
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:versionCode="117"
android:versionName="4.1.3">
android:versionCode="118"
android:versionName="4.1.4">
<!-- android:allowBackup="false" -->
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

6
app/src/main/java/uk/org/openseizuredetector/SdServer.java
View File

@@ -508,7 +508,7 @@ public class SdServer extends Service implements SdDataReceiver {
i.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
PendingIntent contentIntent =
PendingIntent.getActivity(this,
0, i, PendingIntent.FLAG_UPDATE_CURRENT);
0, i, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
String smsStr;
if (mSMSAlarm) {
smsStr = getString(R.string.sms_location_alarm_active);
@@ -1715,12 +1715,12 @@ public class SdServer extends Service implements SdDataReceiver {
i.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
PendingIntent contentIntent =
PendingIntent.getActivity(getApplicationContext(),
0, i, PendingIntent.FLAG_UPDATE_CURRENT);
0, i, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
Intent loginIntent = new Intent(getApplicationContext(), AuthenticateActivity.class);
loginIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
PendingIntent loginPendingIntent =
PendingIntent.getActivity(getApplicationContext(),
0, loginIntent, PendingIntent.FLAG_UPDATE_CURRENT);
0, loginIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
String contentStr = getString(R.string.datasharing_notification_text);
Notification notification = notificationBuilder

1
app/src/main/res/values/strings.xml
View File

@@ -3,6 +3,7 @@
<string name="app_name">OpenSeizureDetector</string>
<string name="changelog">
"\n
\nV4.1.4 - Fixed bug in notifications on Android 12
\nV4.1.3 - Fixed display of O2 Saturation in Network Data Source, and added Polish Translations by Jacek Błoniarz-Łuczak. Fixed crash when displaying main activity during alarm on some devices. Added adaptive Heart Rate alarms
\nV4.1.2 - Added Machine Learning (Artificial Intelligence) Detection Algorithm Option (CNN V0.24) and 'Normal Daily Activity (NDA) logging function
"</string>