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
0b02e811
Commit
0b02e811
authored
Sep 15, 2016
by
d8ahazard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Holy tapdancing god, it works now!
parent
8f973661
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
58 additions
and
11 deletions
+58
-11
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+25
-0
ModulesFragment.java
app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
+31
-9
Utils.java
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+2
-2
No files found.
app/src/main/AndroidManifest.xml
View file @
0b02e811
...
...
@@ -24,7 +24,32 @@
<category
android:name=
"android.intent.category.LAUNCHER"
/>
</intent-filter>
</activity>
<activity
android:name=
"com.ipaulpro.afilechooser.FileChooserActivity"
android:icon=
"@drawable/ic_chooser"
android:enabled=
"@bool/use_activity"
android:exported=
"true"
android:label=
"@string/choose_file"
>
<intent-filter>
<action
android:name=
"android.intent.action.GET_CONTENT"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.OPENABLE"
/>
<data
android:mimeType=
"*/*"
/>
</intent-filter>
</activity>
<provider
android:name=
"com.ianhanniballake.localstorage.LocalStorageProvider"
android:authorities=
"com.topjohnwu.magisk.documents"
android:enabled=
"@bool/use_provider"
android:exported=
"true"
android:grantUriPermissions=
"true"
android:permission=
"android.permission.MANAGE_DOCUMENTS"
>
<intent-filter>
<action
android:name=
"android.content.action.DOCUMENTS_PROVIDER"
/>
</intent-filter>
</provider>
<activity
android:name=
".AboutActivity"
android:theme=
"@style/AppTheme.Transparent"
/>
...
...
app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
View file @
0b02e811
...
...
@@ -2,9 +2,12 @@ package com.topjohnwu.magisk;
import
android.app.Activity
;
import
android.content.Intent
;
import
android.graphics.Bitmap
;
import
android.graphics.BitmapFactory
;
import
android.net.Uri
;
import
android.os.AsyncTask
;
import
android.os.Bundle
;
import
android.provider.MediaStore
;
import
android.support.annotation.Nullable
;
import
android.support.design.widget.FloatingActionButton
;
import
android.support.design.widget.TabLayout
;
...
...
@@ -12,13 +15,17 @@ import android.support.v4.app.Fragment;
import
android.support.v4.app.FragmentManager
;
import
android.support.v4.app.FragmentPagerAdapter
;
import
android.support.v4.view.ViewPager
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
import
android.view.Menu
;
import
android.view.MenuInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.widget.ProgressBar
;
import
android.widget.Toast
;
import
com.ipaulpro.afilechooser.FileInfo
;
import
com.ipaulpro.afilechooser.utils.FileUtils
;
import
com.topjohnwu.magisk.module.Module
;
import
com.topjohnwu.magisk.module.RepoHelper
;
import
com.topjohnwu.magisk.utils.Utils
;
...
...
@@ -54,9 +61,10 @@ public class ModulesFragment extends Fragment {
ButterKnife
.
bind
(
this
,
view
);
fabio
.
setOnClickListener
(
v
->
{
Intent
fileIntent
=
new
Intent
(
Intent
.
ACTION_OPEN_DOCUMENT
);
fileIntent
.
setType
(
"application/zip"
);
fileIntent
.
addCategory
(
Intent
.
CATEGORY_OPENABLE
);
Intent
getContentIntent
=
FileUtils
.
createGetContentIntent
(
null
);
getContentIntent
.
setType
(
"application/zip"
);
Intent
fileIntent
=
Intent
.
createChooser
(
getContentIntent
,
"Select a file"
);
startActivityForResult
(
fileIntent
,
FETCH_ZIP_CODE
);
});
...
...
@@ -75,13 +83,27 @@ public class ModulesFragment extends Fragment {
@Override
public
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
Uri
mUri
=
data
.
getData
();
final
int
takeFlags
=
data
.
getFlags
()
&
(
Intent
.
FLAG_GRANT_READ_URI_PERMISSION
|
Intent
.
FLAG_GRANT_WRITE_URI_PERMISSION
);
if
(
resultCode
==
Activity
.
RESULT_OK
&&
requestCode
==
FETCH_ZIP_CODE
)
{
new
Utils
.
FlashZIP
(
getActivity
(),
mUri
,
takeFlags
).
execute
();
if
(
data
!=
null
)
{
// Get the URI of the selected file
final
Uri
uri
=
data
.
getData
();
Log
.
i
(
"Magisk"
,
"ModulesFragment: Uri = "
+
uri
.
toString
()
+
" or "
);
new
Utils
.
FlashZIP
(
getActivity
(),
uri
).
execute
();
try
{
// Get the file path from the URI
FileInfo
fileInfo
=
FileUtils
.
getFileInfo
(
getActivity
(),
uri
);
Toast
.
makeText
(
getActivity
(),
"File Selected: "
+
fileInfo
.
getDisplayName
()
+
" size: "
+
fileInfo
.
getSize
(),
Toast
.
LENGTH_LONG
).
show
();
if
(!
fileInfo
.
isExternal
())
{
}
else
{
}
}
catch
(
Exception
e
)
{
Log
.
e
(
"FileSelectorTestAc..."
,
"File select error"
,
e
);
}
}
}
@Override
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View file @
0b02e811
...
...
@@ -506,7 +506,7 @@ public class Utils {
deleteFileAfter
=
false
;
}
public
FlashZIP
(
Context
context
,
Uri
uRi
,
int
flags
)
{
public
FlashZIP
(
Context
context
,
Uri
uRi
)
{
mContext
=
context
;
mUri
=
uRi
;
deleteFileAfter
=
true
;
...
...
@@ -527,7 +527,7 @@ public class Utils {
this
.
cancel
(
true
);
}
ContentResolver
contentResolver
=
mContext
.
getContentResolver
();
contentResolver
.
takePersistableUriPermission
(
mUri
,
flags
);
//
contentResolver.takePersistableUriPermission(mUri, flags);
try
{
InputStream
in
=
contentResolver
.
openInputStream
(
mUri
);
Log
.
d
(
"Magisk"
,
"Firing inputStream"
);
...
...
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