Skip to content

Bugfix/issue 1812 Android 13 Support #1826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 6, 2022
Merged

Bugfix/issue 1812 Android 13 Support #1826

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8dd082d
Update target and compile sdk to api 33 for sdl_android and hello sdl…
JulianKast Aug 25, 2022
70754e7
Add POST_NOTIFICATION permission to hello_SDL
JulianKast Aug 25, 2022
7ba0d67
Add comments for denying permission
JulianKast Aug 29, 2022
399f373
Formatting fixes
JulianKast Aug 30, 2022
bf7e660
Review updates
JulianKast Aug 31, 2022
cb1c48e
Flip permission methods and rename them
JulianKast Sep 4, 2022
881bbc2
Check local array to see if we need bluetooth connect permission
JulianKast Sep 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Flip permission methods and rename them
  • Loading branch information
@JulianKast
JulianKast committed Sep 4, 2022
commit cb1c48e1172481db5861bc9d1ecdda4989b0453b
20 changes: 14 additions & 6 deletions android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,20 @@ protected void onCreate(Bundle savedInstanceState) {
}
}

private boolean checkBTPermission() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !checkPermission(Manifest.permission.BLUETOOTH_CONNECT);
/**
* Boolean method that checks API level and check to see if we need to request BLUETOOTH_CONNECT permission
* @return false if we need to request BLUETOOTH_CONNECT permission
*/
private boolean hasBTPermission() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? checkPermission(Manifest.permission.BLUETOOTH_CONNECT) : true;
}

private boolean checkPNPermission() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && !checkPermission(Manifest.permission.POST_NOTIFICATIONS);
/**
* Boolean method that checks API level and check to see if we need to request POST_NOTIFICATIONS permission
* @return false if we need to request POST_NOTIFICATIONS permission
*/
private boolean hasPNPermission() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU ? checkPermission(Manifest.permission.POST_NOTIFICATIONS) : true;
}

private boolean checkPermission(String permission) {
Expand All @@ -57,10 +65,10 @@ private void requestPermission(String[] permissions, int REQUEST_CODE) {

private @NonNull String[] permissionsNeeded() {
ArrayList<String> result = new ArrayList<>();
if (checkBTPermission()) {
if (!hasBTPermission()) {
result.add(Manifest.permission.BLUETOOTH_CONNECT);
}
if (checkPNPermission()) {
if (!hasPNPermission()) {
result.add(Manifest.permission.POST_NOTIFICATIONS);
}
return (result.toArray(new String[result.size()]));
Expand Down