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
01656025
Commit
01656025
authored
Apr 10, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More cleanups
parent
96127f8b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
23 deletions
+20
-23
BaseActivity.java
...in/java/com/topjohnwu/magisk/components/BaseActivity.java
+16
-17
BaseFragment.java
...in/java/com/topjohnwu/magisk/components/BaseFragment.java
+2
-2
MagiskLogFragment.java
...ava/com/topjohnwu/magisk/fragments/MagiskLogFragment.java
+1
-2
ModulesFragment.java
.../java/com/topjohnwu/magisk/fragments/ModulesFragment.java
+1
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/components/BaseActivity.java
View file @
01656025
...
@@ -10,7 +10,6 @@ import android.os.Build;
...
@@ -10,7 +10,6 @@ import android.os.Build;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.view.WindowManager
;
import
android.view.WindowManager
;
import
android.widget.Toast
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
...
@@ -29,8 +28,6 @@ import com.topjohnwu.magisk.utils.LocaleManager;
...
@@ -29,8 +28,6 @@ import com.topjohnwu.magisk.utils.LocaleManager;
public
abstract
class
BaseActivity
extends
AppCompatActivity
implements
Event
.
AutoListener
{
public
abstract
class
BaseActivity
extends
AppCompatActivity
implements
Event
.
AutoListener
{
private
static
Runnable
grantCallback
;
static
int
[]
EMPTY_INT_ARRAY
=
new
int
[
0
];
static
int
[]
EMPTY_INT_ARRAY
=
new
int
[
0
];
private
SparseArrayCompat
<
ActivityResultListener
>
resultListeners
=
new
SparseArrayCompat
<>();
private
SparseArrayCompat
<
ActivityResultListener
>
resultListeners
=
new
SparseArrayCompat
<>();
...
@@ -91,14 +88,14 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
...
@@ -91,14 +88,14 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
}
}
public
void
runWithExternalRW
(
Runnable
callback
)
{
public
void
runWithExternalRW
(
Runnable
callback
)
{
runWithPermission
(
new
String
[]
{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
},
callback
);
runWithPermission
s
(
new
String
[]
{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
},
callback
);
}
}
public
void
runWithPermission
(
String
[]
permissions
,
Runnable
callback
)
{
public
void
runWithPermission
s
(
String
[]
permissions
,
Runnable
callback
)
{
runWithPermission
(
this
,
permissions
,
callback
);
runWithPermission
s
(
this
,
permissions
,
callback
);
}
}
public
static
void
runWithPermission
(
Context
context
,
String
[]
permissions
,
Runnable
callback
)
{
public
static
void
runWithPermission
s
(
Context
context
,
String
[]
permissions
,
Runnable
callback
)
{
boolean
granted
=
true
;
boolean
granted
=
true
;
for
(
String
perm
:
permissions
)
{
for
(
String
perm
:
permissions
)
{
if
(
ContextCompat
.
checkSelfPermission
(
context
,
perm
)
!=
PackageManager
.
PERMISSION_GRANTED
)
if
(
ContextCompat
.
checkSelfPermission
(
context
,
perm
)
!=
PackageManager
.
PERMISSION_GRANTED
)
...
@@ -110,14 +107,20 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
...
@@ -110,14 +107,20 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
}
else
{
}
else
{
// Passed in context should be an activity if not granted, need to show dialog!
// Passed in context should be an activity if not granted, need to show dialog!
if
(
context
instanceof
BaseActivity
)
{
if
(
context
instanceof
BaseActivity
)
{
grantCallback
=
callback
;
BaseActivity
activity
=
(
BaseActivity
)
context
;
ActivityCompat
.
requestPermissions
((
BaseActivity
)
context
,
permissions
,
0
);
int
code
=
callback
.
hashCode
()
&
0xFFFF
;
activity
.
resultListeners
.
put
(
code
,
((
i
,
d
)
->
callback
.
run
()));
ActivityCompat
.
requestPermissions
(
activity
,
permissions
,
code
);
}
}
}
}
}
}
@Override
@Override
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
onActivityResultListener
(
requestCode
,
resultCode
,
data
);
}
private
void
onActivityResultListener
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
ActivityResultListener
listener
=
resultListeners
.
get
(
requestCode
);
ActivityResultListener
listener
=
resultListeners
.
get
(
requestCode
);
if
(
listener
!=
null
)
{
if
(
listener
!=
null
)
{
resultListeners
.
remove
(
requestCode
);
resultListeners
.
remove
(
requestCode
);
...
@@ -137,14 +140,10 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
...
@@ -137,14 +140,10 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
if
(
result
!=
PackageManager
.
PERMISSION_GRANTED
)
if
(
result
!=
PackageManager
.
PERMISSION_GRANTED
)
grant
=
false
;
grant
=
false
;
}
}
if
(
grant
)
{
if
(
grant
)
if
(
grantCallback
!=
null
)
{
onActivityResultListener
(
requestCode
,
0
,
null
);
grantCallback
.
run
();
else
}
resultListeners
.
remove
(
requestCode
);
}
else
{
Toast
.
makeText
(
this
,
R
.
string
.
no_rw_storage
,
Toast
.
LENGTH_LONG
).
show
();
}
grantCallback
=
null
;
}
}
public
interface
ActivityResultListener
{
public
interface
ActivityResultListener
{
...
...
app/src/main/java/com/topjohnwu/magisk/components/BaseFragment.java
View file @
01656025
...
@@ -44,8 +44,8 @@ public abstract class BaseFragment extends Fragment implements Event.AutoListene
...
@@ -44,8 +44,8 @@ public abstract class BaseFragment extends Fragment implements Event.AutoListene
((
BaseActivity
)
requireActivity
()).
startActivityForResult
(
intent
,
requestCode
,
listener
);
((
BaseActivity
)
requireActivity
()).
startActivityForResult
(
intent
,
requestCode
,
listener
);
}
}
p
ublic
void
runWithPermission
(
String
[]
permissions
,
Runnable
callback
)
{
p
rotected
void
runWithExternalRW
(
Runnable
callback
)
{
((
BaseActivity
)
requireActivity
()).
runWith
Permission
(
permissions
,
callback
);
((
BaseActivity
)
requireActivity
()).
runWith
ExternalRW
(
callback
);
}
}
@Override
@Override
...
...
app/src/main/java/com/topjohnwu/magisk/fragments/MagiskLogFragment.java
View file @
01656025
package
com
.
topjohnwu
.
magisk
.
fragments
;
package
com
.
topjohnwu
.
magisk
.
fragments
;
import
android.Manifest
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
import
android.view.Menu
;
import
android.view.Menu
;
...
@@ -67,7 +66,7 @@ public class MagiskLogFragment extends BaseFragment {
...
@@ -67,7 +66,7 @@ public class MagiskLogFragment extends BaseFragment {
readLogs
();
readLogs
();
return
true
;
return
true
;
case
R
.
id
.
menu_save
:
case
R
.
id
.
menu_save
:
runWith
Permission
(
new
String
[]
{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
},
this
::
saveLogs
);
runWith
ExternalRW
(
this
::
saveLogs
);
return
true
;
return
true
;
case
R
.
id
.
menu_clear
:
case
R
.
id
.
menu_clear
:
clearLogs
();
clearLogs
();
...
...
app/src/main/java/com/topjohnwu/magisk/fragments/ModulesFragment.java
View file @
01656025
package
com
.
topjohnwu
.
magisk
.
fragments
;
package
com
.
topjohnwu
.
magisk
.
fragments
;
import
android.Manifest
;
import
android.app.Activity
;
import
android.app.Activity
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android.os.Bundle
;
...
@@ -44,7 +43,7 @@ public class ModulesFragment extends BaseFragment {
...
@@ -44,7 +43,7 @@ public class ModulesFragment extends BaseFragment {
@OnClick
(
R
.
id
.
fab
)
@OnClick
(
R
.
id
.
fab
)
void
selectFile
()
{
void
selectFile
()
{
runWith
Permission
(
new
String
[]
{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
},
()
->
{
runWith
ExternalRW
(
()
->
{
Intent
intent
=
new
Intent
(
Intent
.
ACTION_GET_CONTENT
);
Intent
intent
=
new
Intent
(
Intent
.
ACTION_GET_CONTENT
);
intent
.
setType
(
"application/zip"
);
intent
.
setType
(
"application/zip"
);
startActivityForResult
(
intent
,
Const
.
ID
.
FETCH_ZIP
);
startActivityForResult
(
intent
,
Const
.
ID
.
FETCH_ZIP
);
...
...
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