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
c86c2661
Commit
c86c2661
authored
Aug 25, 2016
by
dvdandroid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed download file path to internal storage
parent
dabb2225
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
4 deletions
+35
-4
WelcomeActivity.java
app/src/main/java/com/topjohnwu/magisk/WelcomeActivity.java
+34
-3
strings.xml
app/src/main/res/values/strings.xml
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/WelcomeActivity.java
View file @
c86c2661
package
com
.
topjohnwu
.
magisk
;
package
com
.
topjohnwu
.
magisk
;
import
android.Manifest
;
import
android.app.ProgressDialog
;
import
android.app.ProgressDialog
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.DialogInterface
;
import
android.content.DialogInterface
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.content.SharedPreferences
;
import
android.content.pm.PackageManager
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.AsyncTask
;
import
android.os.AsyncTask
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.os.Environment
;
import
android.os.Handler
;
import
android.os.Handler
;
import
android.support.annotation.IdRes
;
import
android.support.annotation.IdRes
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.NonNull
;
import
android.support.design.widget.NavigationView
;
import
android.support.design.widget.NavigationView
;
import
android.support.v4.app.ActivityCompat
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.FragmentTransaction
;
import
android.support.v4.app.FragmentTransaction
;
import
android.support.v4.view.GravityCompat
;
import
android.support.v4.view.GravityCompat
;
...
@@ -62,6 +66,9 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
...
@@ -62,6 +66,9 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
@IdRes
@IdRes
private
int
mSelectedId
=
R
.
id
.
magisk
;
private
int
mSelectedId
=
R
.
id
.
magisk
;
private
String
mLastLink
;
private
boolean
mLastIsApp
;
@Override
@Override
protected
void
onCreate
(
final
Bundle
savedInstanceState
)
{
protected
void
onCreate
(
final
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
...
@@ -180,6 +187,17 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
...
@@ -180,6 +187,17 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
}
}
}
}
@Override
public
void
onRequestPermissionsResult
(
int
requestCode
,
@NonNull
String
[]
permissions
,
@NonNull
int
[]
grantResults
)
{
super
.
onRequestPermissionsResult
(
requestCode
,
permissions
,
grantResults
);
if
(
requestCode
==
0
&&
grantResults
[
0
]
==
PackageManager
.
PERMISSION_GRANTED
)
{
new
DownloadFile
(
this
,
mLastLink
,
mLastIsApp
).
execute
();
}
else
{
Toast
.
makeText
(
this
,
R
.
string
.
permissionNotGranted
,
Toast
.
LENGTH_LONG
).
show
();
}
}
private
class
CheckUpdates
extends
AsyncTask
<
Void
,
Void
,
String
>
{
private
class
CheckUpdates
extends
AsyncTask
<
Void
,
Void
,
String
>
{
private
final
Context
context
;
private
final
Context
context
;
...
@@ -271,7 +289,16 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
...
@@ -271,7 +289,16 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
.
setPositiveButton
(
R
.
string
.
update
,
new
DialogInterface
.
OnClickListener
()
{
.
setPositiveButton
(
R
.
string
.
update
,
new
DialogInterface
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
DialogInterface
dialogInterface
,
int
i
)
{
public
void
onClick
(
DialogInterface
dialogInterface
,
int
i
)
{
new
DownloadFile
(
context
,
link
,
app
);
mLastLink
=
link
;
mLastIsApp
=
app
;
if
(
ActivityCompat
.
checkSelfPermission
(
WelcomeActivity
.
this
,
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
)
!=
PackageManager
.
PERMISSION_GRANTED
&&
Build
.
VERSION
.
SDK_INT
>=
23
)
{
requestPermissions
(
new
String
[]{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
},
0
);
return
;
}
new
DownloadFile
(
context
,
link
,
app
).
execute
();
}
}
})
})
.
setNegativeButton
(
R
.
string
.
no_thanks
,
null
)
.
setNegativeButton
(
R
.
string
.
no_thanks
,
null
)
...
@@ -296,10 +323,14 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
...
@@ -296,10 +323,14 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
this
.
link
=
link
;
this
.
link
=
link
;
this
.
context
=
context
;
this
.
context
=
context
;
File
dir
=
new
File
(
Environment
.
getExternalStorageDirectory
()
+
"/Magisk"
);
if
(!
dir
.
exists
())
dir
.
mkdir
();
if
(
apk
)
{
if
(
apk
)
{
downloadFile
=
new
File
(
getFilesDir
()
+
"/MagiskManager.apk"
);
downloadFile
=
new
File
(
dir
+
"/MagiskManager.apk"
);
}
else
{
}
else
{
downloadFile
=
new
File
(
getFilesDir
()
+
"/Magisk.zip"
);
downloadFile
=
new
File
(
dir
+
"/Magisk.zip"
);
}
}
Toast
.
makeText
(
context
,
downloadFile
.
getPath
(),
Toast
.
LENGTH_SHORT
).
show
();
Toast
.
makeText
(
context
,
downloadFile
.
getPath
(),
Toast
.
LENGTH_SHORT
).
show
();
...
...
app/src/main/res/values/strings.xml
View file @
c86c2661
...
@@ -63,6 +63,6 @@
...
@@ -63,6 +63,6 @@
<string
name=
"no_thanks"
>
No, thanks
</string>
<string
name=
"no_thanks"
>
No, thanks
</string>
<string
name=
"never_show_again"
>
Don\'t show again
</string>
<string
name=
"never_show_again"
>
Don\'t show again
</string>
<string
name=
"error_download_file"
>
Error downloading file
</string>
<string
name=
"error_download_file"
>
Error downloading file
</string>
<string
name=
"flash_recovery"
>
File downloaded, you can flash it in recovery
</string>
<string
name=
"flash_recovery"
>
File downloaded
in Magisk directory
, you can flash it in recovery
</string>
</resources>
</resources>
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