mirror of
https://github.com/topjohnwu/Magisk.git
synced 2026-01-14 13:57:25 -08:00
Zip Autoflash; Massive refactor
This commit is contained in:
topjohnwu
@@ -1,17 +1,9 @@
|
||||
package com.topjohnwu.magisk;
|
||||
|
||||
import android.Manifest;
|
||||
import android.app.DownloadManager;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.net.Uri;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
import android.os.Environment;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.app.ActivityCompat;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.content.FileProvider;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
@@ -22,24 +14,10 @@ import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.topjohnwu.magisk.receivers.ApkReceiver;
|
||||
import com.topjohnwu.magisk.receivers.DownloadReceiver;
|
||||
import com.topjohnwu.magisk.receivers.ZipReceiver;
|
||||
import com.topjohnwu.magisk.utils.Shell;
|
||||
import com.topjohnwu.magisk.utils.Utils;
|
||||
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.util.List;
|
||||
|
||||
import butterknife.BindColor;
|
||||
import butterknife.BindView;
|
||||
@@ -47,8 +25,6 @@ import butterknife.ButterKnife;
|
||||
|
||||
public class MagiskFragment extends Fragment {
|
||||
|
||||
private static final String JSON_UPDATE_CHECK = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/updates/magisk_update.json";
|
||||
|
||||
@BindView(R.id.progressBarVersion) ProgressBar progressBar;
|
||||
|
||||
@BindView(R.id.magiskStatusView) View magiskStatusView;
|
||||
@@ -76,10 +52,6 @@ public class MagiskFragment extends Fragment {
|
||||
int statusOK = R.drawable.ic_check_circle;
|
||||
int statusUnknown = R.drawable.ic_help;
|
||||
|
||||
private String mLastLink, mLastFile;
|
||||
private boolean mLastIsApp;
|
||||
private List<String> version;
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
||||
@@ -87,49 +59,14 @@ public class MagiskFragment extends Fragment {
|
||||
ButterKnife.bind(this, v);
|
||||
|
||||
new updateUI().execute();
|
||||
new CheckUpdates().execute();
|
||||
|
||||
return v;
|
||||
}
|
||||
|
||||
private void setListener(View clickView, DownloadReceiver receiver, String link, String msg, String file) {
|
||||
clickView.setOnClickListener(view -> new AlertDialog.Builder(getContext())
|
||||
.setTitle(R.string.update_available)
|
||||
.setMessage(Html.fromHtml(msg))
|
||||
.setCancelable(false)
|
||||
.setPositiveButton(R.string.download, (dialogInterface, i) -> {
|
||||
|
||||
if (ActivityCompat.checkSelfPermission(getContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
|
||||
Toast.makeText(getContext(), R.string.permissionNotGranted, Toast.LENGTH_LONG).show();
|
||||
return;
|
||||
}
|
||||
|
||||
File downloadFile, dir = new File(Environment.getExternalStorageDirectory() + "/MagiskManager");
|
||||
|
||||
downloadFile = new File(dir + "/" + file);
|
||||
|
||||
if (!dir.exists()) dir.mkdir();
|
||||
|
||||
DownloadManager downloadManager = (DownloadManager) getContext().getSystemService(Context.DOWNLOAD_SERVICE);
|
||||
DownloadManager.Request request = new DownloadManager.Request(Uri.parse(link));
|
||||
request.setDestinationUri(Uri.fromFile(downloadFile));
|
||||
|
||||
if (downloadFile.exists()) downloadFile.delete();
|
||||
|
||||
receiver.setDownloadID(downloadManager.enqueue(request));
|
||||
|
||||
getActivity().registerReceiver(receiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
|
||||
})
|
||||
.setNegativeButton(R.string.no_thanks, null)
|
||||
.show());
|
||||
}
|
||||
|
||||
private class updateUI extends AsyncTask<Void, Void, Void> {
|
||||
|
||||
@Override
|
||||
protected Void doInBackground(Void... voids) {
|
||||
// Make sure static block invoked
|
||||
Shell.rootAccess();
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -137,7 +74,7 @@ public class MagiskFragment extends Fragment {
|
||||
protected void onPostExecute(Void v) {
|
||||
super.onPostExecute(v);
|
||||
|
||||
if (Shell.magiskVersion == -1) {
|
||||
if (Utils.magiskVersion == -1) {
|
||||
magiskStatusContainer.setBackgroundColor(grey500);
|
||||
magiskStatusIcon.setImageResource(statusUnknown);
|
||||
|
||||
@@ -148,46 +85,10 @@ public class MagiskFragment extends Fragment {
|
||||
magiskStatusIcon.setImageResource(statusOK);
|
||||
|
||||
magiskVersion.setTextColor(green500);
|
||||
magiskVersion.setText(getString(R.string.magisk_version, String.valueOf(Shell.magiskVersion)));
|
||||
magiskVersion.setText(getString(R.string.magisk_version, String.valueOf(Utils.magiskVersion)));
|
||||
}
|
||||
|
||||
progressBar.setVisibility(View.GONE);
|
||||
magiskStatusView.setVisibility(View.VISIBLE);
|
||||
}
|
||||
}
|
||||
|
||||
private class CheckUpdates extends AsyncTask<Void, Void, String> {
|
||||
|
||||
@Override
|
||||
protected String doInBackground(Void... voids) {
|
||||
try {
|
||||
HttpURLConnection c = (HttpURLConnection) new URL(JSON_UPDATE_CHECK).openConnection();
|
||||
c.setRequestMethod("GET");
|
||||
c.setInstanceFollowRedirects(false);
|
||||
c.setDoOutput(false);
|
||||
c.connect();
|
||||
|
||||
BufferedReader br = new BufferedReader(new InputStreamReader(c.getInputStream()));
|
||||
StringBuilder sb = new StringBuilder();
|
||||
String line;
|
||||
while ((line = br.readLine()) != null) {
|
||||
sb.append(line);
|
||||
}
|
||||
br.close();
|
||||
return sb.toString();
|
||||
} catch (IOException e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPostExecute(String result) {
|
||||
super.onPostExecute(result);
|
||||
|
||||
appCheckUpdatesProgress.setVisibility(View.GONE);
|
||||
magiskCheckUpdatesProgress.setVisibility(View.GONE);
|
||||
|
||||
if (result == null) {
|
||||
if (Utils.remoteMagiskVersion == -1) {
|
||||
appCheckUpdatesContainer.setBackgroundColor(accent);
|
||||
magiskCheckUpdatesContainer.setBackgroundColor(accent);
|
||||
|
||||
@@ -196,59 +97,68 @@ public class MagiskFragment extends Fragment {
|
||||
|
||||
appCheckUpdatesStatus.setText(R.string.cannot_check_updates);
|
||||
magiskCheckUpdatesStatus.setText(R.string.cannot_check_updates);
|
||||
return;
|
||||
}
|
||||
|
||||
magiskUpdateView.setVisibility(View.VISIBLE);
|
||||
appUpdateView.setVisibility(View.VISIBLE);
|
||||
|
||||
try {
|
||||
JSONObject json = new JSONObject(result);
|
||||
|
||||
JSONObject app = json.getJSONObject("app");
|
||||
JSONObject magisk = json.getJSONObject("magisk");
|
||||
|
||||
String appVersionCode = app.getString("versionCode");
|
||||
String appLink = app.getString("link");
|
||||
String appChangelog = app.getString("changelog");
|
||||
|
||||
String magiskVersionCode = magisk.getString("versionCode");
|
||||
String magiskLink = magisk.getString("link");
|
||||
String magiskChangelog = magisk.getString("changelog");
|
||||
|
||||
//if (Integer.parseInt(magiskVersionCode) > versionInt) {
|
||||
if (99 > Shell.magiskVersion) {
|
||||
} else {
|
||||
if (Utils.remoteMagiskVersion > Utils.magiskVersion) {
|
||||
magiskCheckUpdatesContainer.setBackgroundColor(blue500);
|
||||
magiskCheckUpdatesIcon.setImageResource(R.drawable.ic_file_download);
|
||||
magiskCheckUpdatesStatus.setText(getString(R.string.magisk_update_available, magiskVersionCode));
|
||||
setListener(magiskUpdateView, new ZipReceiver(), "https://www.dropbox.com/s/dc16jf1ifhv6ef4/Magisk-v7.zip?dl=1",
|
||||
getString(R.string.update_available_message, "Magisk", appVersionCode, magiskChangelog),
|
||||
"latest_magisk.zip"
|
||||
);
|
||||
magiskCheckUpdatesStatus.setText(getString(R.string.magisk_update_available, String.valueOf(Utils.remoteMagiskVersion)));
|
||||
magiskUpdateView.setOnClickListener(view -> new AlertDialog.Builder(getActivity())
|
||||
.setTitle(getString(R.string.update_title, getString(R.string.magisk)))
|
||||
.setMessage(Html.fromHtml(getString(R.string.update_msg, getString(R.string.magisk), String.valueOf(Utils.remoteMagiskVersion), Utils.magiskChangelog)))
|
||||
.setCancelable(true)
|
||||
.setPositiveButton(R.string.download_install, (dialogInterface, i) -> {
|
||||
Utils.downloadAndReceive(
|
||||
getActivity(),
|
||||
new Utils.DownloadReceiver(getString(R.string.magisk)) {
|
||||
@Override
|
||||
public void task(File file) {
|
||||
new Utils.FlashZIP(mContext, mName, file.getPath()).execute();
|
||||
}
|
||||
},
|
||||
Utils.magiskLink, "latest_magisk.zip");
|
||||
})
|
||||
.setNegativeButton(R.string.no_thanks, null)
|
||||
.show());
|
||||
} else {
|
||||
magiskCheckUpdatesContainer.setBackgroundColor(green500);
|
||||
magiskCheckUpdatesIcon.setImageResource(R.drawable.ic_check_circle);
|
||||
magiskCheckUpdatesStatus.setText(getString(R.string.up_to_date, getString(R.string.magisk)));
|
||||
}
|
||||
|
||||
if (Integer.parseInt(appVersionCode) > BuildConfig.VERSION_CODE) {
|
||||
if (Utils.remoteAppVersion > BuildConfig.VERSION_CODE) {
|
||||
appCheckUpdatesContainer.setBackgroundColor(blue500);
|
||||
appCheckUpdatesIcon.setImageResource(R.drawable.ic_file_download);
|
||||
appCheckUpdatesStatus.setText(getString(R.string.app_update_available, appVersionCode));
|
||||
setListener(appUpdateView, new ApkReceiver(), appLink,
|
||||
getString(R.string.update_available_message, "Magisk Manager", appVersionCode, appChangelog),
|
||||
"latest_manager.apk"
|
||||
appCheckUpdatesStatus.setText(getString(R.string.app_update_available, String.valueOf(Utils.remoteAppVersion)));
|
||||
appUpdateView.setOnClickListener(view -> new AlertDialog.Builder(getActivity())
|
||||
.setTitle(getString(R.string.update_title, getString(R.string.app_name)))
|
||||
.setMessage(Html.fromHtml(getString(R.string.update_msg, getString(R.string.app_name), String.valueOf(Utils.remoteAppVersion), Utils.appChangelog)))
|
||||
.setCancelable(true)
|
||||
.setPositiveButton(R.string.download_install, (dialogInterface, i) -> {
|
||||
Utils.downloadAndReceive(getActivity(),
|
||||
new Utils.DownloadReceiver() {
|
||||
@Override
|
||||
public void task(File file) {
|
||||
Intent install = new Intent(Intent.ACTION_INSTALL_PACKAGE);
|
||||
install.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||
install.setData(FileProvider.getUriForFile(mContext, "com.topjohnwu.magisk.provider", file));
|
||||
mContext.startActivity(install);
|
||||
}
|
||||
},
|
||||
Utils.appLink, "latest_manager.apk");
|
||||
})
|
||||
.setNegativeButton(R.string.no_thanks, null)
|
||||
.show()
|
||||
);
|
||||
|
||||
} else {
|
||||
appCheckUpdatesContainer.setBackgroundColor(green500);
|
||||
appCheckUpdatesIcon.setImageResource(R.drawable.ic_check_circle);
|
||||
appCheckUpdatesStatus.setText(getString(R.string.up_to_date, getString(R.string.app_name)));
|
||||
}
|
||||
|
||||
|
||||
} catch (JSONException ignored) {
|
||||
}
|
||||
|
||||
progressBar.setVisibility(View.GONE);
|
||||
appCheckUpdatesProgress.setVisibility(View.GONE);
|
||||
magiskCheckUpdatesProgress.setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user