TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-11-15 22:53:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various small fixes

Browse Source
This commit is contained in:
topjohnwu
2016-12-27 14:30:26 +08:00
parent 0f254dca13
commit c7e64f40f9
8 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
View File

@@ -13,6 +13,7 @@ import android.util.Log;
import android.widget.Toast;
import com.topjohnwu.magisk.InstallFragment;
import com.topjohnwu.magisk.MainActivity;
import com.topjohnwu.magisk.ModulesFragment;
import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.ReposFragment;
@@ -256,19 +257,10 @@ public class Async {
}
protected void onSuccess() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
StatusFragment.updateCheckDone.trigger();
new LoadModules().exec();
AlertDialog.Builder builder;
String theme = prefs.getString("theme", "");
if (theme.equals("Dark")) {
builder = new AlertDialog.Builder(mContext, R.style.AlertDialog_dh);
} else {
builder = new AlertDialog.Builder(mContext);
}
builder
MainActivity.alertBuilder
.setTitle(R.string.reboot_title)
.setMessage(R.string.reboot_msg)
.setPositiveButton(R.string.reboot, (dialogInterface1, i) -> Shell.sh("su -c reboot"))

13
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View File

@@ -33,6 +33,8 @@ import javax.crypto.spec.DESKeySpec;
public class Utils {
public static boolean isDownloading = false;
private static final String cryptoPass = "MagiskRox666";
private static final String secret = "GTYybRBTYf5his9kQ16ZNO7qgkBJ/5MyVe4CGceAOIoXgSnnk8FTd4F1dE9p5Eus";
@@ -90,16 +92,25 @@ public class Utils {
}
public static void dlAndReceive(Context context, DownloadReceiver receiver, String link, String filename) {
File file = new File(Environment.getExternalStorageDirectory() + "/MagiskManager/" + filename);
if (isDownloading) {
return;
}
if (ActivityCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
Toast.makeText(context, R.string.permissionNotGranted, Toast.LENGTH_LONG).show();
return;
}
File file = new File(Environment.getExternalStorageDirectory() + "/MagiskManager/" + filename);
if ((!file.getParentFile().exists() && !file.getParentFile().mkdirs()) || (file.exists() && !file.delete())) {
Toast.makeText(context, R.string.permissionNotGranted, Toast.LENGTH_LONG).show();
return;
}
Toast.makeText(context, context.getString(R.string.downloading_toast, filename), Toast.LENGTH_LONG).show();
isDownloading = true;
DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
DownloadManager.Request request = new DownloadManager.Request(Uri.parse(link));
request.setDestinationUri(Uri.fromFile(file));