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
ef13b3a3
Commit
ef13b3a3
authored
Aug 25, 2016
by
dvdandroid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change update checker; using a JSON file now
parent
6fb90813
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
207 additions
and
17 deletions
+207
-17
build.gradle
app/build.gradle
+0
-1
magisk_update.json
app/magisk_update.json
+12
-0
magisk_update.xml
app/magisk_update.xml
+0
-11
WelcomeActivity.java
app/src/main/java/com/topjohnwu/magisk/WelcomeActivity.java
+183
-4
strings.xml
app/src/main/res/values-it/strings.xml
+5
-1
strings.xml
app/src/main/res/values/strings.xml
+7
-0
No files found.
app/build.gradle
View file @
ef13b3a3
...
...
@@ -25,7 +25,6 @@ dependencies {
compile
'com.android.support:recyclerview-v7:24.2.0'
compile
'com.android.support:cardview-v7:24.2.0'
compile
'com.android.support:design:24.2.0'
compile
'com.github.javiersantos:AppUpdater:2.3'
compile
'com.jakewharton:butterknife:8.2.1'
apt
'com.jakewharton:butterknife-compiler:8.2.1'
...
...
app/magisk_update.json
0 → 100644
View file @
ef13b3a3
{
"app"
:
{
"versionCode"
:
"4"
,
"link"
:
"http://forum.xda-developers.com/devdb/project/dl/?id=19924&task=get"
,
"changelog"
:
"<b>Version 2.0</b>!"
},
"magisk"
:
{
"versionCode"
:
"6"
,
"link"
:
"http://forum.xda-developers.com/devdb/project/dl/?id=19960&task=get"
,
"changelog"
:
"<b>Version 6</b>!"
}
}
\ No newline at end of file
app/magisk_update.xml
deleted
100644 → 0
View file @
6fb90813
<AppUpdater>
<update>
<latestVersion>
2.0
</latestVersion>
<url>
http://forum.xda-developers.com/android/software/mod-magisk-v1-universal-systemless-t3432382
</url>
<releaseNotes>
- Version 4.0!
</releaseNotes>
</update>
</AppUpdater>
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/WelcomeActivity.java
View file @
ef13b3a3
package
com
.
topjohnwu
.
magisk
;
import
android.app.ProgressDialog
;
import
android.content.DialogInterface
;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.net.Uri
;
import
android.os.AsyncTask
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Handler
;
...
...
@@ -12,13 +17,29 @@ import android.support.v4.app.FragmentTransaction;
import
android.support.v4.view.GravityCompat
;
import
android.support.v4.widget.DrawerLayout
;
import
android.support.v7.app.ActionBarDrawerToggle
;
import
android.support.v7.app.AlertDialog
;
import
android.support.v7.app.AppCompatActivity
;
import
android.support.v7.widget.Toolbar
;
import
android.text.TextUtils
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.widget.Toast
;
import
com.github.javiersantos.appupdater.AppUpdater
;
import
com.github.javiersantos.appupdater.enums.UpdateFrom
;
import
com.topjohnwu.magisk.utils.Shell
;
import
org.json.JSONException
;
import
org.json.JSONObject
;
import
java.io.BufferedReader
;
import
java.io.DataInputStream
;
import
java.io.DataOutputStream
;
import
java.io.File
;
import
java.io.FileOutputStream
;
import
java.io.IOException
;
import
java.io.InputStreamReader
;
import
java.net.HttpURLConnection
;
import
java.net.URL
;
import
java.net.URLConnection
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
@@ -26,7 +47,7 @@ import butterknife.ButterKnife;
public
class
WelcomeActivity
extends
AppCompatActivity
implements
NavigationView
.
OnNavigationItemSelectedListener
{
private
static
final
String
SELECTED_ITEM_ID
=
"SELECTED_ITEM_ID"
;
private
static
final
String
XML
_UPDATE_CHECK
=
"https://raw.githubusercontent.com/topjohnwu/MagiskManager/master/app/magisk_update.xml"
;
private
static
final
String
JSON
_UPDATE_CHECK
=
"https://raw.githubusercontent.com/topjohnwu/MagiskManager/master/app/magisk_update.xml"
;
private
final
Handler
mDrawerHandler
=
new
Handler
();
@BindView
(
R
.
id
.
toolbar
)
Toolbar
toolbar
;
...
...
@@ -84,7 +105,6 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
navigationView
.
setNavigationItemSelectedListener
(
this
);
new
AppUpdater
(
this
).
setUpdateFrom
(
UpdateFrom
.
XML
).
setUpdateXML
(
XML_UPDATE_CHECK
).
start
();
}
@Override
...
...
@@ -153,4 +173,163 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
}
}
}
private
class
CheckUpdates
extends
AsyncTask
<
Void
,
Void
,
String
>
{
@Override
protected
String
doInBackground
(
Void
...
voids
)
{
try
{
HttpURLConnection
c
=
(
HttpURLConnection
)
new
URL
(
JSON_UPDATE_CHECK
).
openConnection
();
c
.
setRequestMethod
(
"GET"
);
c
.
setInstanceFollowRedirects
(
false
);
c
.
setDoOutput
(
false
);
c
.
connect
();
BufferedReader
br
=
new
BufferedReader
(
new
InputStreamReader
(
c
.
getInputStream
()));
StringBuilder
sb
=
new
StringBuilder
();
String
line
;
while
((
line
=
br
.
readLine
())
!=
null
)
{
sb
.
append
(
line
);
}
br
.
close
();
return
sb
.
toString
();
}
catch
(
IOException
e
)
{
return
null
;
}
}
@Override
protected
void
onPostExecute
(
String
result
)
{
super
.
onPostExecute
(
result
);
if
(
result
==
null
)
return
;
try
{
JSONObject
json
=
new
JSONObject
(
result
);
JSONObject
app
=
json
.
getJSONObject
(
"app"
);
JSONObject
magisk
=
json
.
getJSONObject
(
"magisk"
);
String
appVersionCode
=
app
.
getString
(
"versionCode"
);
String
appLink
=
app
.
getString
(
"link"
);
String
appChangelog
=
app
.
getString
(
"changelog"
);
String
magiskVersionCode
=
magisk
.
getString
(
"versionCode"
);
String
magiskLink
=
magisk
.
getString
(
"link"
);
String
magiskChangelog
=
magisk
.
getString
(
"changelog"
);
if
(
Integer
.
parseInt
(
appVersionCode
)
>
BuildConfig
.
VERSION_CODE
)
{
showUpdateDialog
(
true
,
appVersionCode
,
appLink
,
appChangelog
);
}
String
version
=
Shell
.
sh
(
"getprop magisk.version"
).
get
(
0
);
int
versionInt
=
TextUtils
.
isEmpty
(
version
)
?
0
:
Integer
.
parseInt
(
version
);
if
(
Integer
.
parseInt
(
magiskVersionCode
)
>
versionInt
)
{
showUpdateDialog
(
false
,
magiskVersionCode
,
magiskLink
,
magiskChangelog
);
}
}
catch
(
JSONException
ignored
)
{
}
}
private
boolean
isUpdateIgnored
(
String
version
)
{
SharedPreferences
prefs
=
getSharedPreferences
(
getPackageName
()
+
"_preferences"
,
MODE_PRIVATE
);
return
prefs
.
getBoolean
(
"update_ignored_"
+
version
,
false
);
}
private
void
setUpdateIgnored
(
String
version
)
{
SharedPreferences
prefs
=
getSharedPreferences
(
getPackageName
()
+
"_preferences"
,
MODE_PRIVATE
);
prefs
.
edit
().
putBoolean
(
"update_ignored_"
+
version
,
true
).
apply
();
}
private
void
showUpdateDialog
(
final
boolean
app
,
final
String
versionCode
,
final
String
link
,
String
changelog
)
{
if
(
isUpdateIgnored
(
versionCode
))
return
;
String
text
=
app
?
getString
(
R
.
string
.
app_name
)
:
getString
(
R
.
string
.
magisk
);
String
msg
=
getString
(
R
.
string
.
update_available_message
,
text
,
versionCode
,
changelog
);
new
AlertDialog
.
Builder
(
getApplicationContext
())
.
setTitle
(
R
.
string
.
update_available
)
.
setMessage
(
msg
)
.
setCancelable
(
false
)
.
setPositiveButton
(
R
.
string
.
update
,
new
DialogInterface
.
OnClickListener
()
{
@Override
public
void
onClick
(
DialogInterface
dialogInterface
,
int
i
)
{
new
DownloadFile
(
link
,
app
);
}
})
.
setNegativeButton
(
R
.
string
.
no_thanks
,
null
)
.
setNeutralButton
(
R
.
string
.
never_show_again
,
new
DialogInterface
.
OnClickListener
()
{
@Override
public
void
onClick
(
DialogInterface
dialogInterface
,
int
i
)
{
setUpdateIgnored
(
versionCode
);
}
})
.
show
();
}
}
private
class
DownloadFile
extends
AsyncTask
<
Void
,
Integer
,
Boolean
>
{
private
final
String
link
;
private
final
File
downloadFile
;
private
final
ProgressDialog
progress
;
public
DownloadFile
(
String
link
,
boolean
apk
)
{
this
.
link
=
link
;
if
(
apk
)
{
downloadFile
=
new
File
(
getFilesDir
()
+
"/MagiskManager.apk"
);
}
else
{
downloadFile
=
new
File
(
getFilesDir
()
+
"/Magisk.zip"
);
}
progress
=
ProgressDialog
.
show
(
getApplicationContext
(),
null
,
getString
(
R
.
string
.
loading
),
true
,
false
);
}
@Override
protected
Boolean
doInBackground
(
Void
...
voids
)
{
try
{
URL
u
=
new
URL
(
link
);
URLConnection
conn
=
u
.
openConnection
();
int
contentLength
=
conn
.
getContentLength
();
DataInputStream
stream
=
new
DataInputStream
(
u
.
openStream
());
byte
[]
buffer
=
new
byte
[
contentLength
];
stream
.
readFully
(
buffer
);
stream
.
close
();
DataOutputStream
fos
=
new
DataOutputStream
(
new
FileOutputStream
(
downloadFile
));
fos
.
write
(
buffer
);
fos
.
flush
();
fos
.
close
();
return
true
;
}
catch
(
IOException
e
)
{
return
false
;
}
}
@Override
protected
void
onPostExecute
(
Boolean
result
)
{
super
.
onPostExecute
(
result
);
progress
.
dismiss
();
if
(!
result
)
{
Toast
.
makeText
(
getApplicationContext
(),
R
.
string
.
error_download_file
,
Toast
.
LENGTH_LONG
).
show
();
return
;
}
if
(
downloadFile
.
getPath
().
contains
(
"apk"
))
{
Intent
intent
=
new
Intent
(
Intent
.
ACTION_VIEW
);
intent
.
setDataAndType
(
Uri
.
fromFile
(
downloadFile
),
"application/vnd.android.package-archive"
);
intent
.
setFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
);
startActivity
(
intent
);
}
else
{
Toast
.
makeText
(
getApplicationContext
(),
R
.
string
.
flash_recovery
,
Toast
.
LENGTH_LONG
).
show
();
}
}
}
}
app/src/main/res/values-it/strings.xml
View file @
ef13b3a3
...
...
@@ -43,8 +43,12 @@
<string
name=
"sdcard_not_writable"
>
SD card non trovata o non scrivibile
</string>
<string
name=
"selinux_enforcing_info"
>
SELinux è forzato
</string>
<string
name=
"selinux_permissive_info"
>
SELinux è permissivo\nSpegni SELinux solamente se necessario!
</string>
<string
name=
"selinux_samsung"
>
Samsung non supporta la modifica dello stato di SELinux
</string>
<string
name=
"selinux_samsung
_info
"
>
Samsung non supporta la modifica dello stato di SELinux
</string>
<string
name=
"selinux_toggle"
>
SeLinux Toggle
</string>
<string
name=
"support_thread"
>
Thread di supporto
</string>
<string
name=
"translators"
>
dvdandroid
</string>
<string
name=
"magisk_version_error"
>
Hai installato Magisk?
</string>
<string
name=
"root_error"
>
Errore root
</string>
<string
name=
"root_error_info"
>
Stato Safety Net sconosciuto
</string>
<string
name=
"selinux_error_info"
>
Stato SELinux sconosciuto
</string>
</resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @
ef13b3a3
...
...
@@ -57,5 +57,12 @@
<string
name=
"force_reload"
>
Refresh
</string>
<string
name=
"no_modules_found"
>
No modules found
</string>
<string
name=
"loading"
>
Loading…
</string>
<string
name=
"update_available"
>
Update available!
</string>
<string
name=
"update"
>
Update
</string>
<string
name=
"update_available_message"
>
A new update of %1$s is available.\nChangelog version %2$s: \n%3$s
</string>
<string
name=
"no_thanks"
>
No, thanks
</string>
<string
name=
"never_show_again"
>
Don\'t show again
</string>
<string
name=
"error_download_file"
>
Error downloading file
</string>
<string
name=
"flash_recovery"
>
File downloaded, you can flash it in recovery
</string>
</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