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

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

@@ -240,8 +240,12 @@ public class LogManager {
+ DatabaseUtils.sqlEscapeString(sdData.toJSON(true)) + ","
+ 0
+ ")";
mOsdDb.execSQL(SQLStr);
Log.v(TAG, "data written to database");
if (mOsdDb != null) {
mOsdDb.execSQL(SQLStr);
Log.v(TAG, "writeDatapointToLocalDb(): data written to database");
} else {
Log.e(TAG,"writeDatapointToLocalDb(): mOsdDb is null");
}
} catch (SQLException e) {
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,
45);
}
})
.setNegativeButton(getString(R.string.cancelBtnTxt), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
}).create().show();
}
}
@@ -666,12 +671,18 @@ public class StartupActivity extends AppCompatActivity {
.setPositiveButton(getString(R.string.okBtnTxt), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
Log.i(TAG,"requestLocationPermissions1(): Launching ActivityCompat.requestPermissions()");
Log.i(TAG, "requestLocationPermissions1(): Launching ActivityCompat.requestPermissions()");
ActivityCompat.requestPermissions(StartupActivity.this,
LOCATION_PERMISSIONS_1,
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,
44);
}
})
.setNegativeButton(getString(R.string.cancelBtnTxt), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
}).create().show();
}
}