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
Formatting fixes
  • Loading branch information
@JulianKast
JulianKast committed Aug 30, 2022
commit 399f373a38ad8d00ef3e6a653b6991884e02168b
7 changes: 3 additions & 4 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 @@ -23,8 +23,8 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_main);

if (BuildConfig.TRANSPORT.equals("MULTI") || BuildConfig.TRANSPORT.equals("MULTI_HB")) {
if(permissionsNeeded().length >0){
requestPermission(permissionsNeeded(),REQUEST_CODE);
if (permissionsNeeded().length > 0) {
requestPermission(permissionsNeeded(), REQUEST_CODE);
Copy link
Member

@joeygrover joeygrover Aug 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (permissionsNeeded().length > 0) {
requestPermission(permissionsNeeded(), REQUEST_CODE);
String[] permissionsNeeded = permissionsNeeded();
if (permissionsNeeded.length > 0) {
requestPermission(permissionsNeeded, REQUEST_CODE);

Copy link
Member

@joeygrover joeygrover Aug 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
requestPermission(permissionsNeeded(), REQUEST_CODE);
requestPermission(permissionsNeeded, REQUEST_CODE);

if (checkBTPermission()) {
return;
}
Expand All @@ -39,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
}

private boolean checkBTPermission() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !checkPermission(Manifest.permission.BLUETOOTH_CONNECT);
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !checkPermission(Manifest.permission.BLUETOOTH_CONNECT);
}

private boolean checkPNPermission() {
Expand All @@ -52,7 +52,6 @@ private boolean checkPermission(String permission) {

private void requestPermission(String[] permissions, int REQUEST_CODE) {
ActivityCompat.requestPermissions(this, permissions, REQUEST_CODE);

}

private String[] permissionsNeeded() {
Copy link
Member

@joeygrover joeygrover Aug 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't a big deal, but still a good idea.

Suggested change
private String[] permissionsNeeded() {
private @NonNull String[] permissionsNeeded() {

Expand Down