Skip to content

Commit 3494ef7

Browse files
committed
Revert "[HGNN-2160] webview가 두개띄워질 경우 권한요청이 두번이루어져서 크래시 발생"
This reverts commit 868c2ca.
1 parent 89b0778 commit 3494ef7

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

src/android/InAppBrowser.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,9 +1180,8 @@ public void postMessage(String data) {
11801180
public void askForPermission(String permission, int requestCode) {
11811181
if (!PermissionHelper.hasPermission(this, permission)) {
11821182
PermissionHelper.requestPermission(this, requestCode, permission);
1183-
} else if (myRequest != null) {
1183+
} else {
11841184
myRequest.grant(myRequest.getResources());
1185-
myRequest = null;
11861185
}
11871186
}
11881187

@@ -1196,19 +1195,13 @@ public void askForPermission(String permission, int requestCode) {
11961195
public void onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults) throws JSONException {
11971196
for (int r : grantResults) {
11981197
if (r == PackageManager.PERMISSION_DENIED) {
1199-
if (myRequest != null) {
1200-
myRequest.deny();
1201-
myRequest = null;
1202-
}
1198+
myRequest.deny();
12031199
return;
12041200
}
12051201
}
12061202

12071203
if (requestCode == MY_PERMISSIONS_REQUEST_RECORD_AUDIO || requestCode == MY_PERMISSIONS_REQUEST_CAMERA) {
1208-
if (myRequest != null) {
1209-
myRequest.grant(myRequest.getResources());
1210-
myRequest = null;
1211-
}
1204+
myRequest.grant(myRequest.getResources());
12121205
}
12131206
}
12141207

0 commit comments

Comments
 (0)