Skip to content
This repository was archived by the owner on Oct 3, 2024. It is now read-only.

Short circuit perms request at root method #76

Merged
merged 11 commits into from
Jan 23, 2017
Merged

Short circuit perms request at root method #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f309e44
Short-circuit perms request at root method
SUPERCILEX Jan 19, 2017
682b43e
Change exception type
SUPERCILEX Jan 19, 2017
caed95c
Fix mistakes and nits
SUPERCILEX Jan 19, 2017
b67e0e8
Initial refactor
SUPERCILEX Jan 20, 2017
eb99a50
Cleanup
SUPERCILEX Jan 20, 2017
941c08f
Add links to documentation
SUPERCILEX Jan 21, 2017
b4f4ad9
Remove triplication of documentation
SUPERCILEX Jan 21, 2017
ddd3f74
Use android.app.Fragment#getActivity() for context instead of getContext
SUPERCILEX Jan 21, 2017
733043e
Remove unnecessary abstraction
SUPERCILEX Jan 22, 2017
35f8d63
Argh Intellij! I finally updated my code style to put interfaces on top
SUPERCILEX Jan 22, 2017
c097b4c
Cleanup
SUPERCILEX Jan 22, 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
3 changes: 1 addition & 2 deletions app/src/main/java/pub/devrel/easypermissions/sample/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
import pub.devrel.easypermissions.AppSettingsDialog;
import pub.devrel.easypermissions.EasyPermissions;

public class MainActivity extends AppCompatActivity implements
EasyPermissions.PermissionCallbacks {
public class MainActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {

private static final String TAG = "MainActivity";

Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/pub/devrel/easypermissions/sample/MainFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.EasyPermissions;

/**
* Created in {@link R.layout#activity_main}
*/
public class MainFragment extends Fragment implements EasyPermissions.PermissionCallbacks {

private static final String TAG = "MainFragment";
private static final int RC_SMS_PERM = 122;
private static final int RC_SETTINGS = 123;

@Override
public View onCreateView (LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
Expand Down
8 changes: 5 additions & 3 deletions easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package pub.devrel.easypermissions;

import android.annotation.TargetApi;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import android.support.v4.app.Fragment;
import android.text.TextUtils;

Expand Down Expand Up @@ -65,6 +66,7 @@ public void onClick(DialogInterface dialog, int which) {
intent.setData(uri);

// Start for result
//noinspection NewApi The Builder constructor prevents this
startForResult(activityOrFragment, intent, settingsRequestCode);
}
});
Expand All @@ -76,7 +78,7 @@ public void onClick(DialogInterface dialog, int which) {
mAlertDialog = dialogBuilder.create();
}

@TargetApi(11)
@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

TargetApi is technically deprecated.

From the RequiresApi docs:

This is similar in purpose to the older @TargetApi annotation, but more clearly expresses that this is a requirement on the caller, rather than being used to "suppress" warnings within the method that exceed the minSdkVersion.

private void startForResult(Object object, Intent intent, int requestCode) {
if (object instanceof Activity) {
((Activity) object).startActivityForResult(intent, requestCode);
Expand Down Expand Up @@ -135,7 +137,7 @@ public Builder(@NonNull android.support.v4.app.Fragment fragment, @NonNull Strin
* @param fragment the Fragment in which to display the dialog.
* @param rationale text explaining why the user should launch the app settings screen.
*/
@TargetApi(11)
@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
public Builder(@NonNull android.app.Fragment fragment, @NonNull String rationale) {
mActivityOrFragment = fragment;
mContext = fragment.getActivity();
Expand Down
Loading