Skip to content

Permissions in Android Lollipop #78

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
bezmian merged 8 commits into from
Sep 21, 2017
Merged

Permissions in Android Lollipop #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
03e7cd2
SlideFragmentBuilder now throws Exception when missing necessary prop…
bezmian Feb 3, 2017
0b17c6a
Fix Codacy issues
bezmian Feb 3, 2017
ede70c4
Fix Codacy issues
bezmian Feb 3, 2017
3d1d1fe
Move permissions handling to SlideFragmentBase
bezmian Feb 8, 2017
57886a4
Create behaviours and fragments package
bezmian Feb 10, 2017
cdfb1bf
Fix showing permissions button in Android Lollipop and versions below.
bezmian Feb 10, 2017
758608b
Merge remote-tracking branch 'origin/release/0.0.6' into feature/perm…
bezmian Feb 20, 2017
c8cbb54
Remove unnecessary methods from CustomSlide
bezmian Feb 20, 2017
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
20 changes: 15 additions & 5 deletions ...ro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragmentBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package agency.tango.materialintroscreen.fragments;

import android.content.pm.PackageManager;
import android.os.Build;
import android.support.annotation.ColorRes;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.text.TextUtils;

import java.util.ArrayList;
import java.util.Collections;
Expand Down Expand Up @@ -43,6 +45,10 @@ public String[] neededPermissions() {
}

public boolean hasAnyPermissionsToGrant() {
if (!isAndroidVersionSupportingPermissions()) {
return false;
}

boolean hasPermissionToGrant = hasPermissionsToGrant(neededPermissions());
if (!hasPermissionToGrant) {
hasPermissionToGrant = hasPermissionsToGrant(possiblePermissions());
Expand All @@ -60,7 +66,7 @@ public void askForPermissions() {

if (neededPermissions() != null) {
for (String permission : neededPermissions()) {
if (isNotNullOrEmpty(permission)) {
if (!TextUtils.isEmpty(permission)) {
if (ContextCompat.checkSelfPermission(getContext(), permission)
!= PackageManager.PERMISSION_GRANTED) {
notGrantedPermissions.add(permission);
Expand All @@ -70,7 +76,7 @@ public void askForPermissions() {
}
if (possiblePermissions() != null) {
for (String permission : possiblePermissions()) {
if (isNotNullOrEmpty(permission)) {
if (!TextUtils.isEmpty(permission)) {
if (ContextCompat.checkSelfPermission(getContext(), permission)
!= PackageManager.PERMISSION_GRANTED) {
notGrantedPermissions.add(permission);
Expand All @@ -86,9 +92,13 @@ public void askForPermissions() {

@SuppressWarnings({"PMD.CollapsibleIfStatements"})
private boolean hasPermissionsToGrant(String[] permissions) {
if (!isAndroidVersionSupportingPermissions()) {
return false;
}

if (permissions != null) {
for (String permission : permissions) {
if (isNotNullOrEmpty(permission)) {
if (!TextUtils.isEmpty(permission)) {
if (ContextCompat.checkSelfPermission(getContext(), permission)
!= PackageManager.PERMISSION_GRANTED) {
return true;
Expand All @@ -106,7 +116,7 @@ private String[] removeEmptyAndNullStrings(final ArrayList<String> permissions)
return list.toArray(new String[list.size()]);
}

public static boolean isNotNullOrEmpty(String string) {
return string != null && !string.isEmpty();
private boolean isAndroidVersionSupportingPermissions() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
}
}
7 changes: 3 additions & 4 deletions ...java/agency/tango/materialintroscreen/listeners/MessageButtonBehaviourOnPageSelected.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package agency.tango.materialintroscreen.listeners;

import android.text.TextUtils;
import android.util.SparseArray;
import android.view.View;
import android.view.animation.AnimationUtils;
import android.widget.Button;

import agency.tango.materialintroscreen.behaviours.MessageButtonBehaviour;
import agency.tango.materialintroscreen.R;
import agency.tango.materialintroscreen.adapter.SlidesAdapter;
import agency.tango.materialintroscreen.behaviours.MessageButtonBehaviour;
import agency.tango.materialintroscreen.fragments.SlideFragmentBase;

import static agency.tango.materialintroscreen.fragments.SlideFragmentBase.isNotNullOrEmpty;


public class MessageButtonBehaviourOnPageSelected implements IPageSelectedListener {

Expand Down Expand Up @@ -53,7 +52,7 @@ public void onClick(View view) {
}

private boolean checkIfMessageButtonHasBehaviour(int position) {
return messageButtonBehaviours.get(position) != null && isNotNullOrEmpty(
return messageButtonBehaviours.get(position) != null && !TextUtils.isEmpty(
messageButtonBehaviours.get(position).getMessageButtonText());
}

Expand Down