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

Added cancel buttons to permissions dialogs. Fixed crash from issue #45

Browse Source
This commit is contained in:
Graham Jones
2022-03-10 19:51:23 +00:00
parent bbf988e685
commit 7d307529b4
4 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="uk.org.openseizuredetector" package="uk.org.openseizuredetector"
android:versionCode="96" android:versionCode="97"
android:versionName="4.0.0t"> android:versionName="4.0.0v">
<!-- android:allowBackup="false" --> <!-- android:allowBackup="false" -->
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

8
app/src/main/java/uk/org/openseizuredetector/LogManager.java
View File

@@ -240,8 +240,12 @@ public class LogManager {
+ DatabaseUtils.sqlEscapeString(sdData.toJSON(true)) + "," + DatabaseUtils.sqlEscapeString(sdData.toJSON(true)) + ","
+ 0 + 0
+ ")"; + ")";
mOsdDb.execSQL(SQLStr); if (mOsdDb != null) {
Log.v(TAG, "data written to database"); mOsdDb.execSQL(SQLStr);
Log.v(TAG, "writeDatapointToLocalDb(): data written to database");
} else {
Log.e(TAG,"writeDatapointToLocalDb(): mOsdDb is null");
}
} catch (SQLException e) { } catch (SQLException e) {
Log.e(TAG, "writeToLocalDb(): Error Writing Data: " + e.toString()); Log.e(TAG, "writeToLocalDb(): Error Writing Data: " + e.toString());

20
app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
View File

@@ -646,6 +646,11 @@ public class StartupActivity extends AppCompatActivity {
SMS_PERMISSIONS_1, SMS_PERMISSIONS_1,
45); 45);
} }
})
.setNegativeButton(getString(R.string.cancelBtnTxt), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
}).create().show(); }).create().show();
} }
} }
@@ -666,12 +671,18 @@ public class StartupActivity extends AppCompatActivity {
.setPositiveButton(getString(R.string.okBtnTxt), new DialogInterface.OnClickListener() { .setPositiveButton(getString(R.string.okBtnTxt), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
dialog.cancel(); dialog.cancel();
Log.i(TAG,"requestLocationPermissions1(): Launching ActivityCompat.requestPermissions()"); Log.i(TAG, "requestLocationPermissions1(): Launching ActivityCompat.requestPermissions()");
ActivityCompat.requestPermissions(StartupActivity.this, ActivityCompat.requestPermissions(StartupActivity.this,
LOCATION_PERMISSIONS_1, LOCATION_PERMISSIONS_1,
43); 43);
} }
}).create().show(); })
.setNegativeButton(getString(R.string.cancelBtnTxt), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
})
.create().show();
} }
} }
@@ -696,6 +707,11 @@ public class StartupActivity extends AppCompatActivity {
LOCATION_PERMISSIONS_2, LOCATION_PERMISSIONS_2,
44); 44);
} }
})
.setNegativeButton(getString(R.string.cancelBtnTxt), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
}).create().show(); }).create().show();
} }
} }

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

@@ -3,6 +3,7 @@
<string name="app_name">OpenSeizureDetector</string> <string name="app_name">OpenSeizureDetector</string>
<string name="changelog"> <string name="changelog">
"\n "\n
\nV4.0.0v - Added BLE Characteristic changes for PineWatch, added cancel buttons to permissions dialogs.
\nV4.0.0t - Fixed issue with occasional crashes when network disrupted. Improved 'Prominent Disclosure' of SMS and Location permissions to satisfy Google Play Store requirements. \nV4.0.0t - Fixed issue with occasional crashes when network disrupted. Improved 'Prominent Disclosure' of SMS and Location permissions to satisfy Google Play Store requirements.
\nV4.0.0s - Fixed problem with Android 11 not sending SMS Location alerts. \nV4.0.0s - Fixed problem with Android 11 not sending SMS Location alerts.
\nV4.0.0p - Restored compatibility with Android V6 \nV4.0.0p - Restored compatibility with Android V6