Skip to content

Commit 7bede6f

Browse files
authored
fix(android): fall through request permissions (#11563)
Fixes TIMOB-27741
1 parent 8e3ce4d commit 7bede6f

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

android/modules/calendar/src/java/ti/modules/titanium/calendar/CalendarModule.java

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
importjava.util.ArrayList;
1111

1212
importandroid.provider.CalendarContract;
13+
14+
importorg.appcelerator.kroll.KrollDict;
1315
importorg.appcelerator.kroll.KrollFunction;
1416
importorg.appcelerator.kroll.KrollModule;
1517
importorg.appcelerator.kroll.annotations.Kroll;
@@ -127,6 +129,9 @@ public boolean hasCalendarPermissions()
127129
publicvoidrequestCalendarPermissions(@Kroll.argument(optional = true) KrollFunctionpermissionCallback)
128130
{
129131
if (hasCalendarPermissions()) {
132+
KrollDictresponse = newKrollDict();
133+
response.putCodeAndMessage(0, null);
134+
permissionCallback.callAsync(getKrollObject(), response);
130135
return;
131136
}
132137

android/modules/contacts/src/java/ti/modules/titanium/contacts/ContactsModule.java

+3
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ public boolean hasContactsPermissions()
8383
publicvoidrequestContactsPermissions(@Kroll.argument(optional = true) KrollFunctionpermissionCallback)
8484
{
8585
if (hasContactsPermissions()) {
86+
KrollDictresponse = newKrollDict();
87+
response.putCodeAndMessage(0, null);
88+
permissionCallback.callAsync(getKrollObject(), response);
8689
return;
8790
}
8891

android/modules/filesystem/src/java/ti/modules/titanium/filesystem/FilesystemModule.java

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
importandroid.content.Context;
1616
importandroid.content.pm.PackageManager;
1717
importandroid.os.Build;
18+
importorg.appcelerator.kroll.KrollDict;
1819
importorg.appcelerator.kroll.KrollFunction;
1920
importorg.appcelerator.kroll.KrollInvocation;
2021
importorg.appcelerator.kroll.KrollModule;
@@ -111,6 +112,9 @@ private boolean hasStoragePermissions()
111112
publicvoidrequestStoragePermissions(@Kroll.argument(optional = true) KrollFunctionpermissionCallback)
112113
{
113114
if (hasStoragePermissions()) {
115+
KrollDictresponse = newKrollDict();
116+
response.putCodeAndMessage(0, null);
117+
permissionCallback.callAsync(getKrollObject(), response);
114118
return;
115119
}
116120

android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java

+6
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,9 @@ public void showCamera(@SuppressWarnings("rawtypes") HashMap options)
541541
publicvoidrequestCameraPermissions(@Kroll.argument(optional = true) KrollFunctionpermissionCallback)
542542
{
543543
if (hasCameraPermissions()) {
544+
KrollDictresponse = newKrollDict();
545+
response.putCodeAndMessage(0, null);
546+
permissionCallback.callAsync(getKrollObject(), response);
544547
return;
545548
}
546549

@@ -565,6 +568,9 @@ public void requestCameraPermissions(@Kroll.argument(optional = true) KrollFunct
565568
publicvoidrequestAudioRecorderPermissions(@Kroll.argument(optional = true) KrollFunctionpermissionCallback)
566569
{
567570
if (hasAudioRecorderPermissions()) {
571+
KrollDictresponse = newKrollDict();
572+
response.putCodeAndMessage(0, null);
573+
permissionCallback.callAsync(getKrollObject(), response);
568574
return;
569575
}
570576
String[] permissions = newString[] { Manifest.permission.RECORD_AUDIO };

0 commit comments

Comments
 (0)
close