Skip to content
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

Fix permission prompt #378

Merged
merged 12 commits into from
Oct 15, 2024
Merged

Fix permission prompt #378

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3872ba3
gher android
Lentumunai-Mark Oct 2, 2024
2a45083
Update project versions for library and utils.
Lentumunai-Mark Oct 3, 2024
d234a00
Add tests for permissions helper.
Lentumunai-Mark Oct 14, 2024
23c9610
Revert to original implementation.
Lentumunai-Mark Oct 14, 2024
d6a8ab7
mockk when permissions denied.
Lentumunai-Mark Oct 14, 2024
916eec3
Fix function naming.
Lentumunai-Mark Oct 14, 2024
0ad0a69
Remove file.
Lentumunai-Mark Oct 14, 2024
c8d44fb
undo delete test file.
Lentumunai-Mark Oct 14, 2024
6ab5617
Merge branch 'master' into Fix-permission-prompt
dubdabasoduba Oct 14, 2024
b463265
⬆️ Publishing version 0.10.7-SNAPSHOt
dubdabasoduba Oct 14, 2024
77a43b2
Merge branch 'Fix-permission-prompt' of github.com:onaio/kujaku into …
dubdabasoduba Oct 14, 2024
5747f27
Romove unused deps.
Lentumunai-Mark Oct 14, 2024
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
2 changes: 1 addition & 1 deletion library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
apply plugin: 'realm-android'
apply plugin: 'maven-publish'

version '0.10.6-SNAPSHOT'
version '0.10.7-SNAPSHOT'

project.version = this.version

Expand Down
14 changes: 12 additions & 2 deletions library/src/main/java/io/ona/kujaku/helpers/PermissionsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,33 @@
import com.karumi.dexter.Dexter;
import com.karumi.dexter.listener.multi.MultiplePermissionsListener;

import java.util.ArrayList;
import java.util.List;

import io.ona.kujaku.utils.KujakuMultiplePermissionListener;
import timber.log.Timber;

public class PermissionsHelper {

public static void checkPermissions(String TAG, Context context) {
if (context instanceof Activity) {
List<String> permissions = new ArrayList<>();
permissions.add(Manifest.permission.ACCESS_FINE_LOCATION);

if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
permissions.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
}
Lentumunai-Mark marked this conversation as resolved.
Show resolved Hide resolved
final Activity activity = (Activity) context;

MultiplePermissionsListener dialogMultiplePermissionListener = new KujakuMultiplePermissionListener(activity);

Dexter.withActivity(activity)
.withPermissions(Manifest.permission.ACCESS_FINE_LOCATION, (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) ? Manifest.permission.MANAGE_EXTERNAL_STORAGE : Manifest.permission.WRITE_EXTERNAL_STORAGE)
.withPermissions(permissions)
.withListener(dialogMultiplePermissionListener)
.check();

} else {
Log.wtf(TAG, "KujakuMapView was not started in an activity!! This is very bad or it is being used in tests. We are going to ignore the permissions check! Good luck");
Timber.tag(TAG).wtf("KujakuMapView was not started in an activity!! This is very bad or it is being used in tests. We are going to ignore the permissions check! Good luck");
}
}
}
2 changes: 1 addition & 1 deletion utils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
apply plugin: 'maven-publish'
apply plugin: 'jacoco'

version '0.10.6-SNAPSHOT'
version '0.10.7-SNAPSHOT'
project.version = this.version


Expand Down