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
0568ae53
Commit
0568ae53
authored
Apr 16, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed dependencies on old base
parent
5330dda9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
19 deletions
+23
-19
ReposAdapter.java
...ava/com/topjohnwu/magisk/model/adapters/ReposAdapter.java
+5
-4
BaseActivity.java
.../main/java/com/topjohnwu/magisk/ui/base/BaseActivity.java
+16
-13
BaseFragment.java
.../main/java/com/topjohnwu/magisk/ui/base/BaseFragment.java
+2
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/model/adapters/ReposAdapter.java
View file @
0568ae53
...
@@ -20,7 +20,8 @@ import com.topjohnwu.magisk.data.database.RepoDatabaseHelper;
...
@@ -20,7 +20,8 @@ import com.topjohnwu.magisk.data.database.RepoDatabaseHelper;
import
com.topjohnwu.magisk.model.download.DownloadModuleService
;
import
com.topjohnwu.magisk.model.download.DownloadModuleService
;
import
com.topjohnwu.magisk.model.entity.Module
;
import
com.topjohnwu.magisk.model.entity.Module
;
import
com.topjohnwu.magisk.model.entity.Repo
;
import
com.topjohnwu.magisk.model.entity.Repo
;
import
com.topjohnwu.magisk.ui.base.BaseActivity
;
import
com.topjohnwu.magisk.ui.base.IBaseLeanback
;
import
com.topjohnwu.magisk.ui.base.MagiskActivity
;
import
com.topjohnwu.magisk.utils.Event
;
import
com.topjohnwu.magisk.utils.Event
;
import
com.topjohnwu.magisk.view.MarkDownWindow
;
import
com.topjohnwu.magisk.view.MarkDownWindow
;
import
com.topjohnwu.magisk.view.dialogs.CustomAlertDialog
;
import
com.topjohnwu.magisk.view.dialogs.CustomAlertDialog
;
...
@@ -118,15 +119,15 @@ public class ReposAdapter
...
@@ -118,15 +119,15 @@ public class ReposAdapter
.
setMessage
(
context
.
getString
(
R
.
string
.
repo_install_msg
,
repo
.
getDownloadFilename
()))
.
setMessage
(
context
.
getString
(
R
.
string
.
repo_install_msg
,
repo
.
getDownloadFilename
()))
.
setCancelable
(
true
)
.
setCancelable
(
true
)
.
setPositiveButton
(
R
.
string
.
install
,
(
d
,
i
)
->
.
setPositiveButton
(
R
.
string
.
install
,
(
d
,
i
)
->
startDownload
((
Base
Activity
)
context
,
repo
,
true
))
startDownload
((
Magisk
Activity
)
context
,
repo
,
true
))
.
setNeutralButton
(
R
.
string
.
download
,
(
d
,
i
)
->
.
setNeutralButton
(
R
.
string
.
download
,
(
d
,
i
)
->
startDownload
((
Base
Activity
)
context
,
repo
,
false
))
startDownload
((
Magisk
Activity
)
context
,
repo
,
false
))
.
setNegativeButton
(
R
.
string
.
no_thanks
,
null
)
.
setNegativeButton
(
R
.
string
.
no_thanks
,
null
)
.
show
();
.
show
();
});
});
}
}
private
void
startDownload
(
BaseActivity
activity
,
Repo
repo
,
Boolean
install
)
{
private
<
Ctxt
extends
Context
&
IBaseLeanback
>
void
startDownload
(
Ctxt
activity
,
Repo
repo
,
Boolean
install
)
{
activity
.
runWithExternalRW
(()
->
{
activity
.
runWithExternalRW
(()
->
{
Intent
intent
=
new
Intent
(
activity
,
ClassMap
.
get
(
DownloadModuleService
.
class
))
Intent
intent
=
new
Intent
(
activity
,
ClassMap
.
get
(
DownloadModuleService
.
class
))
.
putExtra
(
"repo"
,
repo
).
putExtra
(
"install"
,
install
);
.
putExtra
(
"repo"
,
repo
).
putExtra
(
"install"
,
install
);
...
...
app/src/main/java/com/topjohnwu/magisk/ui/base/BaseActivity.java
View file @
0568ae53
...
@@ -26,11 +26,11 @@ import androidx.collection.SparseArrayCompat;
...
@@ -26,11 +26,11 @@ import androidx.collection.SparseArrayCompat;
import
androidx.core.app.ActivityCompat
;
import
androidx.core.app.ActivityCompat
;
import
androidx.core.content.ContextCompat
;
import
androidx.core.content.ContextCompat
;
public
abstract
class
BaseActivity
extends
AppCompatActivity
implements
Event
.
AutoListener
{
public
abstract
class
BaseActivity
extends
AppCompatActivity
implements
Event
.
AutoListener
,
IBaseLeanback
{
static
int
[]
EMPTY_INT_ARRAY
=
new
int
[
0
];
static
int
[]
EMPTY_INT_ARRAY
=
new
int
[
0
];
private
SparseArrayCompat
<
ActivityResultListener
>
resultListeners
=
new
SparseArrayCompat
<>();
private
final
SparseArrayCompat
<
ActivityResultListener
>
resultListeners
=
new
SparseArrayCompat
<>();
public
App
app
=
App
.
self
;
public
App
app
=
App
.
self
;
@Override
@Override
...
@@ -87,14 +87,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
...
@@ -87,14 +87,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
setRequestedOrientation
(
ActivityInfo
.
SCREEN_ORIENTATION_LOCKED
);
setRequestedOrientation
(
ActivityInfo
.
SCREEN_ORIENTATION_LOCKED
);
}
}
public
void
runWithExternalRW
(
Runnable
callback
)
{
runWithPermissions
(
new
String
[]
{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
},
callback
);
}
public
void
runWithPermissions
(
String
[]
permissions
,
Runnable
callback
)
{
runWithPermissions
(
this
,
permissions
,
callback
);
}
public
static
void
runWithPermissions
(
Context
context
,
String
[]
permissions
,
Runnable
callback
)
{
public
static
void
runWithPermissions
(
Context
context
,
String
[]
permissions
,
Runnable
callback
)
{
boolean
granted
=
true
;
boolean
granted
=
true
;
for
(
String
perm
:
permissions
)
{
for
(
String
perm
:
permissions
)
{
...
@@ -109,12 +101,22 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
...
@@ -109,12 +101,22 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
if
(
context
instanceof
BaseActivity
)
{
if
(
context
instanceof
BaseActivity
)
{
BaseActivity
activity
=
(
BaseActivity
)
context
;
BaseActivity
activity
=
(
BaseActivity
)
context
;
int
code
=
callback
.
hashCode
()
&
0xFFFF
;
int
code
=
callback
.
hashCode
()
&
0xFFFF
;
activity
.
resultListeners
.
put
(
code
,
(
(
i
,
d
)
->
callback
.
run
()
));
activity
.
resultListeners
.
put
(
code
,
(
i
,
d
)
->
callback
.
run
(
));
ActivityCompat
.
requestPermissions
(
activity
,
permissions
,
code
);
ActivityCompat
.
requestPermissions
(
activity
,
permissions
,
code
);
}
}
}
}
}
}
@Override
public
final
void
runWithExternalRW
(
Runnable
callback
)
{
runWithPermissions
(
new
String
[]{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
},
callback
);
}
@Override
public
final
void
runWithPermissions
(
String
[]
permissions
,
Runnable
callback
)
{
runWithPermissions
(
this
,
permissions
,
callback
);
}
@Override
@Override
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
onActivityResultListener
(
requestCode
,
resultCode
,
data
);
onActivityResultListener
(
requestCode
,
resultCode
,
data
);
...
@@ -128,9 +130,10 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
...
@@ -128,9 +130,10 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
}
}
}
}
public
void
startActivityForResult
(
Intent
intent
,
int
requestCode
,
ActivityResultListener
listener
)
{
@Override
public
final
void
startActivityForResult
(
Intent
intent
,
int
requestCode
,
ActivityResultListener
listener
)
{
resultListeners
.
put
(
requestCode
,
listener
);
resultListeners
.
put
(
requestCode
,
listener
);
s
uper
.
s
tartActivityForResult
(
intent
,
requestCode
);
startActivityForResult
(
intent
,
requestCode
);
}
}
@Override
@Override
...
...
app/src/main/java/com/topjohnwu/magisk/ui/base/BaseFragment.java
View file @
0568ae53
...
@@ -40,11 +40,11 @@ public abstract class BaseFragment extends Fragment implements Event.AutoListene
...
@@ -40,11 +40,11 @@ public abstract class BaseFragment extends Fragment implements Event.AutoListene
public
void
startActivityForResult
(
Intent
intent
,
int
requestCode
,
public
void
startActivityForResult
(
Intent
intent
,
int
requestCode
,
BaseActivity
.
ActivityResultListener
listener
)
{
BaseActivity
.
ActivityResultListener
listener
)
{
((
BaseActivity
)
requireActivity
()).
startActivityForResult
(
intent
,
requestCode
,
listener
);
((
IBaseLeanback
)
requireActivity
()).
startActivityForResult
(
intent
,
requestCode
,
listener
);
}
}
protected
void
runWithExternalRW
(
Runnable
callback
)
{
protected
void
runWithExternalRW
(
Runnable
callback
)
{
((
BaseActivity
)
requireActivity
()).
runWithExternalRW
(
callback
);
((
IBaseLeanback
)
requireActivity
()).
runWithExternalRW
(
callback
);
}
}
@Override
@Override
...
...
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