Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-06-12 13:17:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename base activity and fragments

Browse Source
This commit is contained in:
topjohnwu
2018-08-01 17:57:11 +08:00
parent a2544768a0
commit 6d0e4a6a5e
24 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/topjohnwu/magisk/components/Activity.java → app/src/main/java/com/topjohnwu/magisk/components/BaseActivity.java
View File

@ -13,7 +13,7 @@ import android.widget.Toast;
import com.topjohnwu.magisk.NoUIActivity;
import com.topjohnwu.magisk.R;
public abstract class Activity extends FlavorActivity {
public abstract class BaseActivity extends FlavorActivity {
public static final String INTENT_PERM = "perm_dialog";
@ -30,14 +30,14 @@ public abstract class Activity extends FlavorActivity {
} else {
// Passed in context should be an activity if not granted, need to show dialog!
permissionGrantCallback = callback;
if (!(context instanceof Activity)) {
if (!(context instanceof BaseActivity)) {
// Start activity to show dialog
Intent intent = new Intent(context, NoUIActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.putExtra(INTENT_PERM, permissions);
context.startActivity(intent);
} else {
ActivityCompat.requestPermissions((Activity) context, permissions, 0);
ActivityCompat.requestPermissions((BaseActivity) context, permissions, 0);
}
}
}

4
app/src/main/java/com/topjohnwu/magisk/utils/Download.java
View File

@ -11,7 +11,7 @@ import android.os.Environment;
import android.widget.Toast;
import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.components.Activity;
import com.topjohnwu.magisk.components.BaseActivity;
import com.topjohnwu.magisk.receivers.DownloadReceiver;
import java.io.File;
@ -27,7 +27,7 @@ public class Download {
if (isDownloading)
return;
Activity.runWithPermission(context,
BaseActivity.runWithPermission(context,
new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, () -> {
File file = new File(EXTERNAL_PATH, getLegalFilename(filename));