gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-01-01 15:37:08 -08:00
Code Issues Packages Projects Releases Wiki Activity

Update strings

Browse Source
This commit is contained in:
topjohnwu
2019-10-29 07:36:50 -04:00
parent 321d11c2c6
commit f7aa451591
10 changed files with 141 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java
View File

@@ -11,31 +11,33 @@ import android.util.Log;
import com.topjohnwu.magisk.net.ErrorHandler;
import com.topjohnwu.magisk.net.Networking;
import com.topjohnwu.magisk.net.ResponseListener;
import com.topjohnwu.magisk.obfuscate.RawData;
import com.topjohnwu.magisk.utils.APKInstall;
import org.json.JSONException;
import org.json.JSONObject;
import static android.R.string.no;
import static android.R.string.ok;
import static android.R.string.yes;
import static com.topjohnwu.magisk.DelegateApplication.MANAGER_APK;
public class DownloadActivity extends Activity {
static final String TAG = "MMStub";
private static final String URL =
BuildConfig.DEV_CHANNEL != null ? BuildConfig.DEV_CHANNEL :
"https://raw.githubusercontent.com/topjohnwu/magisk_files/" +
(BuildConfig.DEBUG ? "canary/debug.json" : "master/stable.json");
RawData.urlBase() + (BuildConfig.DEBUG ? RawData.canary() : RawData.stable());
private String apkLink;
private ErrorHandler err = (conn, e) -> {
Log.e(TAG, "network error", e);
Log.e(getClass().getSimpleName(), "", e);
finish();
};
private void showDialog() {
ProgressDialog.show(this,
getString(R.string.dling),
getString(R.string.dling) + " " + getString(R.string.app_name),
RawData.dling(),
RawData.dling() + " " + RawData.appName(),
true);
}
@@ -58,7 +60,9 @@ public class DownloadActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
RawData.res = getResources();
Networking.init(this);
if (Networking.checkNetworkStatus(this)) {
Networking.get(URL)
.setErrorHandler(err)
@@ -66,9 +70,9 @@ public class DownloadActivity extends Activity {
} else {
new AlertDialog.Builder(this)
.setCancelable(false)
.setTitle(R.string.app_name)
.setMessage(R.string.no_internet_msg)
.setNegativeButton(android.R.string.ok, (d, w) -> finish())
.setTitle(RawData.appName())
.setMessage(RawData.no_internet_msg())
.setNegativeButton(ok, (d, w) -> finish())
.show();
}
}
@@ -82,10 +86,10 @@ public class DownloadActivity extends Activity {
apkLink = manager.getString("link");
new AlertDialog.Builder(DownloadActivity.this)
.setCancelable(false)
.setTitle(R.string.app_name)
.setMessage(R.string.upgrade_msg)
.setPositiveButton(android.R.string.yes, (d, w) -> dlAPK())
.setNegativeButton(android.R.string.no, (d, w) -> finish())
.setTitle(RawData.appName())
.setMessage(RawData.upgrade_msg())
.setPositiveButton(yes, (d, w) -> dlAPK())
.setNegativeButton(no, (d, w) -> finish())
.show();
} catch (JSONException e) {
finish();