MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly set themes for dialogs in stub

Browse Source
This commit is contained in:
topjohnwu 2020-03-30 04:03:33 -07:00
parent a623a5b7cc
commit ef0277d10e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stub/src/main/java/com/topjohnwu/magisk/MainActivity.java
View File

@ -4,8 +4,10 @@ import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Application; import android.app.Application;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.ContextThemeWrapper;
import com.topjohnwu.magisk.net.ErrorHandler; import com.topjohnwu.magisk.net.ErrorHandler;
import com.topjohnwu.magisk.net.Networking; import com.topjohnwu.magisk.net.Networking;
@ -20,7 +22,6 @@ import java.io.File;
import static android.R.string.no; import static android.R.string.no;
import static android.R.string.ok; import static android.R.string.ok;
import static android.R.string.yes; import static android.R.string.yes;
import static android.app.AlertDialog.THEME_DEVICE_DEFAULT_DARK;
public class MainActivity extends Activity { public class MainActivity extends Activity {
@ -37,9 +38,10 @@ public class MainActivity extends Activity {
Log.e(getClass().getSimpleName(), "", e); Log.e(getClass().getSimpleName(), "", e);
finish(); finish();
}; };
private Context themed;
private void showDialog() { private void showDialog() {
ProgressDialog.show(this, ProgressDialog.show(themed,
getString(R.string.dling), getString(R.string.dling),
getString(R.string.dling) + " " + APP_NAME, getString(R.string.dling) + " " + APP_NAME,
true); true);
@ -61,13 +63,14 @@ public class MainActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Networking.init(this); Networking.init(this);
themed = new ContextThemeWrapper(this, android.R.style.Theme_DeviceDefault);
if (Networking.checkNetworkStatus(this)) { if (Networking.checkNetworkStatus(this)) {
Networking.get(URL) Networking.get(URL)
.setErrorHandler(err) .setErrorHandler(err)
.getAsJSONObject(new JSONLoader()); .getAsJSONObject(new JSONLoader());
} else { } else {
new AlertDialog.Builder(this, THEME_DEVICE_DEFAULT_DARK) new AlertDialog.Builder(themed)
.setCancelable(false) .setCancelable(false)
.setTitle(APP_NAME) .setTitle(APP_NAME)
.setMessage(getString(R.string.no_internet_msg)) .setMessage(getString(R.string.no_internet_msg))
@ -83,7 +86,7 @@ public class MainActivity extends Activity {
try { try {
JSONObject manager = json.getJSONObject("app"); JSONObject manager = json.getJSONObject("app");
apkLink = manager.getString("link"); apkLink = manager.getString("link");
new AlertDialog.Builder(MainActivity.this, THEME_DEVICE_DEFAULT_DARK) new AlertDialog.Builder(themed)
.setCancelable(false) .setCancelable(false)
.setTitle(APP_NAME) .setTitle(APP_NAME)
.setMessage(getString(R.string.upgrade_msg)) .setMessage(getString(R.string.upgrade_msg))