Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
ef0277d1
Commit
ef0277d1
authored
Mar 30, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly set themes for dialogs in stub
parent
a623a5b7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
MainActivity.java
stub/src/main/java/com/topjohnwu/magisk/MainActivity.java
+7
-4
No files found.
stub/src/main/java/com/topjohnwu/magisk/MainActivity.java
View file @
ef0277d1
...
@@ -4,8 +4,10 @@ import android.app.Activity;
...
@@ -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;
...
@@ -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 {
...
@@ -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
(
th
is
,
ProgressDialog
.
show
(
th
emed
,
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 {
...
@@ -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
(
th
is
,
THEME_DEVICE_DEFAULT_DARK
)
new
AlertDialog
.
Builder
(
th
emed
)
.
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 {
...
@@ -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
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment