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
3c33f7d2
Commit
3c33f7d2
authored
Dec 11, 2016
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Various small improvements
parent
c9217a41
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
61 additions
and
73 deletions
+61
-73
build.gradle
app/build.gradle
+11
-7
proguard-rules.pro
app/proguard-rules.pro
+26
-0
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+0
-29
ModulesFragment.java
app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
+5
-6
SettingsActivity.java
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+14
-12
ModuleHelper.java
...rc/main/java/com/topjohnwu/magisk/utils/ModuleHelper.java
+1
-1
strings.xml
app/src/main/res/values-de/strings.xml
+0
-3
strings.xml
app/src/main/res/values-es/strings.xml
+0
-3
strings.xml
app/src/main/res/values-it/strings.xml
+0
-3
strings.xml
app/src/main/res/values-nl/strings.xml
+1
-3
strings.xml
app/src/main/res/values-pt/strings.xml
+0
-3
strings.xml
app/src/main/res/values/strings.xml
+3
-3
No files found.
app/build.gradle
View file @
3c33f7d2
apply
plugin:
'com.android.application'
android
{
compileSdkVersion
2
4
buildToolsVersion
"2
4.0.2
"
compileSdkVersion
2
5
buildToolsVersion
"2
5.0.1
"
defaultConfig
{
applicationId
"com.topjohnwu.magisk"
minSdkVersion
21
targetSdkVersion
2
4
targetSdkVersion
2
5
versionCode
7
versionName
"2.5"
jackOptions
{
...
...
@@ -19,8 +19,13 @@ android {
}
}
compileOptions
{
incremental
false
}
buildTypes
{
release
{
minifyEnabled
true
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.pro'
}
}
...
...
@@ -44,11 +49,10 @@ repositories {
dependencies
{
compile
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
compile
'com.android.support:recyclerview-v7:2
4.2
.1'
compile
'com.android.support:cardview-v7:2
4.2
.1'
compile
'com.android.support:design:2
4.2
.1'
compile
'com.android.support:recyclerview-v7:2
5.0
.1'
compile
'com.android.support:cardview-v7:2
5.0
.1'
compile
'com.android.support:design:2
5.0
.1'
compile
'com.jakewharton:butterknife:8.4.0'
compile
'com.github.michalis-vitos:aFileChooser:master'
compile
'com.google.code.gson:gson:2.8.0'
compile
'com.github.clans:fab:1.6.4'
compile
'com.madgag.spongycastle:core:1.54.0.0'
...
...
app/proguard-rules.pro
View file @
3c33f7d2
...
...
@@ -15,3 +15,29 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Gson uses generic type information stored in a class file when working with fields. Proguard
# removes such information by default, so configure it to keep all of it.
-
keepattributes
Signature
# For using GSON @Expose annotation
-
keepattributes
*
Annotation
*
# Gson specific classes
-
keep
class
sun
.
misc
.
Unsafe
{
*
;
}
-
keep
class
com
.
google
.
gson
.
**
{
*
;
}
# Application classes that will be serialized/deserialized over Gson
-
keep
class
com
.
topjohnwu
.
magisk
.
module
.
**
{
*
;
}
-
keep
class
com
.
topjohnwu
.
magisk
.
utils
.
ModuleHelper
$
ValueSortedMap
{
*
;
}
# Prevent proguard from stripping interface information from TypeAdapterFactory,
# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
-
keep
class
*
implements
com
.
google
.
gson
.
TypeAdapterFactory
-
keep
class
*
implements
com
.
google
.
gson
.
JsonSerializer
-
keep
class
*
implements
com
.
google
.
gson
.
JsonDeserializer
-
keep
class
android
.
support
.
v7
.
internal
.
**
{
*
;
}
-
keep
interface
android
.
support
.
v7
.
internal
.
**
{
*
;
}
-
keep
class
android
.
support
.
v7
.
**
{
*
;
}
-
keep
interface
android
.
support
.
v7
.
**
{
*
;
}
app/src/main/AndroidManifest.xml
View file @
3c33f7d2
...
...
@@ -4,8 +4,6 @@
xmlns:tools=
"http://schemas.android.com/tools"
>
<uses-sdk
tools:overrideLibrary=
"com.kcoppock.broadcasttilesupport"
/>
<uses-permission
android:name=
"android.permission.WRITE_EXTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
...
...
@@ -36,33 +34,6 @@
<category
android:name=
"android.intent.category.LAUNCHER"
/>
</intent-filter>
</activity>
<activity
android:name=
"com.ipaulpro.afilechooser.FileChooserActivity"
android:enabled=
"true"
android:exported=
"true"
android:icon=
"@drawable/ic_chooser"
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"
...
...
app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
View file @
3c33f7d2
package
com
.
topjohnwu
.
magisk
;
import
android.app.Activity
;
import
android.app.Fragment
;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
...
...
@@ -15,7 +16,6 @@ import android.view.ViewGroup;
import
android.widget.TextView
;
import
com.github.clans.fab.FloatingActionButton
;
import
com.ipaulpro.afilechooser.utils.FileUtils
;
import
com.topjohnwu.magisk.adapters.ModulesAdapter
;
import
com.topjohnwu.magisk.module.Module
;
import
com.topjohnwu.magisk.utils.Async
;
...
...
@@ -48,10 +48,9 @@ public class ModulesFragment extends Fragment {
ButterKnife
.
bind
(
this
,
mView
);
fabio
.
setOnClickListener
(
v
->
{
Intent
getContentIntent
=
FileUtils
.
createGetContentIntent
(
null
);
getContentIntent
.
setType
(
"application/zip"
);
Intent
fileIntent
=
Intent
.
createChooser
(
getContentIntent
,
"Select a file"
);
startActivityForResult
(
fileIntent
,
FETCH_ZIP_CODE
);
Intent
intent
=
new
Intent
(
Intent
.
ACTION_GET_CONTENT
);
intent
.
setType
(
"application/zip"
);
startActivityForResult
(
intent
,
FETCH_ZIP_CODE
);
});
prefs
=
PreferenceManager
.
getDefaultSharedPreferences
(
getActivity
());
...
...
@@ -80,7 +79,7 @@ public class ModulesFragment extends Fragment {
@Override
public
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
if
(
data
!=
null
)
{
if
(
requestCode
==
FETCH_ZIP_CODE
&&
resultCode
==
Activity
.
RESULT_OK
&&
data
!=
null
)
{
// Get the URI of the selected file
final
Uri
uri
=
data
.
getData
();
new
Async
.
FlashZIP
(
getActivity
(),
uri
).
exec
();
...
...
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View file @
3c33f7d2
...
...
@@ -69,23 +69,24 @@ public class SettingsActivity extends AppCompatActivity {
}
}
public
static
class
SettingsFragment
extends
PreferenceFragment
implements
SharedPreferences
.
OnSharedPreferenceChangeListener
{
public
static
class
SettingsFragment
extends
PreferenceFragment
implements
SharedPreferences
.
OnSharedPreferenceChangeListener
{
private
ListPreference
themePreference
;
private
SharedPreferences
prefs
;
@Override
public
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
addPreferencesFromResource
(
R
.
xml
.
app_settings
);
PreferenceManager
.
setDefaultValues
(
getActivity
(),
R
.
xml
.
app_settings
,
false
);
prefs
=
PreferenceManager
.
getDefaultSharedPreferences
(
getActivity
());
themePreference
=
(
ListPreference
)
findPreference
(
"theme"
);
CheckBoxPreference
busyboxPreference
=
(
CheckBoxPreference
)
findPreference
(
"busybox"
);
CheckBoxPreference
magiskhidePreference
=
(
CheckBoxPreference
)
findPreference
(
"magiskhide"
);
CheckBoxPreference
hostsPreference
=
(
CheckBoxPreference
)
findPreference
(
"hosts"
);
PreferenceManager
.
getDefaultSharedPreferences
(
getActivity
()).
registerOnSharedPreferenceChangeListener
(
this
);
themePreference
.
setSummary
(
themePreference
.
getValue
());
if
(
MagiskFragment
.
magiskVersion
<
9
)
{
...
...
@@ -103,23 +104,23 @@ public class SettingsActivity extends AppCompatActivity {
@Override
public
void
onResume
()
{
super
.
onResume
();
PreferenceManager
.
getDefaultSharedPreferences
(
getActivity
())
.
registerOnSharedPreferenceChangeListener
(
this
);
prefs
.
registerOnSharedPreferenceChangeListener
(
this
);
}
@Override
public
void
onDestroy
()
{
super
.
onDestroy
();
PreferenceManager
.
getDefaultSharedPreferences
(
getActivity
())
.
unregisterOnSharedPreferenceChangeListener
(
this
);
prefs
.
unregisterOnSharedPreferenceChangeListener
(
this
);
}
@Override
public
void
onSharedPreferenceChanged
(
SharedPreferences
sharedPreference
s
,
String
key
)
{
public
void
onSharedPreferenceChanged
(
SharedPreferences
pref
s
,
String
key
)
{
Logger
.
dev
(
"Settings: Prefs change "
+
key
);
boolean
checked
;
switch
(
key
)
{
case
"theme"
:
String
theme
=
sharedPreference
s
.
getString
(
key
,
""
);
String
theme
=
pref
s
.
getString
(
key
,
""
);
themePreference
.
setSummary
(
theme
);
if
(
theme
.
equals
(
"Dark"
))
{
...
...
@@ -133,7 +134,7 @@ public class SettingsActivity extends AppCompatActivity {
startActivity
(
intent
);
break
;
case
"magiskhide"
:
checked
=
sharedPreference
s
.
getBoolean
(
"magiskhide"
,
false
);
checked
=
pref
s
.
getBoolean
(
"magiskhide"
,
false
);
if
(
checked
)
{
new
Async
.
RootTask
<
Void
,
Void
,
Void
>()
{
@Override
...
...
@@ -151,9 +152,10 @@ public class SettingsActivity extends AppCompatActivity {
}
}.
exec
();
}
Toast
.
makeText
(
getActivity
(),
R
.
string
.
settings_reboot_toast
,
Toast
.
LENGTH_LONG
).
show
();
break
;
case
"busybox"
:
checked
=
sharedPreference
s
.
getBoolean
(
"busybox"
,
false
);
checked
=
pref
s
.
getBoolean
(
"busybox"
,
false
);
if
(
checked
)
{
new
Async
.
RootTask
<
Void
,
Void
,
Void
>()
{
@Override
...
...
@@ -174,7 +176,7 @@ public class SettingsActivity extends AppCompatActivity {
Toast
.
makeText
(
getActivity
(),
R
.
string
.
settings_reboot_toast
,
Toast
.
LENGTH_LONG
).
show
();
break
;
case
"hosts"
:
checked
=
sharedPreference
s
.
getBoolean
(
"hosts"
,
false
);
checked
=
pref
s
.
getBoolean
(
"hosts"
,
false
);
if
(
checked
)
{
new
Async
.
RootTask
<
Void
,
Void
,
Void
>()
{
@Override
...
...
@@ -195,10 +197,10 @@ public class SettingsActivity extends AppCompatActivity {
Toast
.
makeText
(
getActivity
(),
R
.
string
.
settings_reboot_toast
,
Toast
.
LENGTH_LONG
).
show
();
break
;
case
"developer_logging"
:
Logger
.
devLog
=
sharedPreference
s
.
getBoolean
(
"developer_logging"
,
false
);
Logger
.
devLog
=
pref
s
.
getBoolean
(
"developer_logging"
,
false
);
break
;
case
"shell_logging"
:
Logger
.
logShell
=
sharedPreference
s
.
getBoolean
(
"shell_logging"
,
false
);
Logger
.
logShell
=
pref
s
.
getBoolean
(
"shell_logging"
,
false
);
break
;
}
...
...
app/src/main/java/com/topjohnwu/magisk/utils/ModuleHelper.java
View file @
3c33f7d2
...
...
@@ -82,7 +82,7 @@ public class ModuleHelper {
}
// Making a request to url and getting response
jsonString
=
WebRequest
.
makeWebServiceCall
(
context
.
getString
(
R
.
string
.
url_main
)
+
Utils
.
getToken
(
),
WebRequest
.
GET
);
jsonString
=
WebRequest
.
makeWebServiceCall
(
context
.
getString
(
R
.
string
.
url_main
,
Utils
.
getToken
()
),
WebRequest
.
GET
);
if
(
jsonString
!=
null
&&
!
jsonString
.
isEmpty
())
{
// Have internet access
...
...
app/src/main/res/values-de/strings.xml
View file @
3c33f7d2
...
...
@@ -79,9 +79,6 @@
<string
name=
"no_magisk_msg"
>
Wollen Sie Magisk herunterladen und installieren?
</string>
<!--URL Templates-->
<string
name=
"url_main"
>
https://api.github.com/orgs/Magisk-Modules-Repo/repos?access_token=
</string>
<string
name=
"file_url"
>
https://raw.githubusercontent.com/Magisk-Modules-Repo/%1$s/master/%2$s
</string>
<string
name=
"zip_url"
>
https://github.com/Magisk-Modules-Repo/%1$s/archive/master.zip
</string>
<!--Settings Fragment -->
<string
name=
"settings_general_category"
>
Allgemein
</string>
...
...
app/src/main/res/values-es/strings.xml
View file @
3c33f7d2
...
...
@@ -81,9 +81,6 @@
<string
name=
"no_magisk_msg"
>
¿Deseas descargar e instalar Magisk?
</string>
<!--URL Templates-->
<string
name=
"url_main"
>
https://api.github.com/orgs/Magisk-Modules-Repo/repos?access_token=
</string>
<string
name=
"file_url"
>
https://raw.githubusercontent.com/Magisk-Modules-Repo/%1$s/master/%2$s
</string>
<string
name=
"zip_url"
>
https://github.com/Magisk-Modules-Repo/%1$s/archive/master.zip
</string>
<!--Settings Activity -->
<string
name=
"settings_general_category"
>
General
</string>
...
...
app/src/main/res/values-it/strings.xml
View file @
3c33f7d2
...
...
@@ -79,9 +79,6 @@
<string
name=
"no_magisk_msg"
>
Vuoi scaricare ed installare Magisk?
</string>
<!--URL Templates-->
<string
name=
"url_main"
>
https://api.github.com/orgs/Magisk-Modules-Repo/repos?access_token=
</string>
<string
name=
"file_url"
>
https://raw.githubusercontent.com/Magisk-Modules-Repo/%1$s/master/%2$s
</string>
<string
name=
"zip_url"
>
https://github.com/Magisk-Modules-Repo/%1$s/archive/master.zip
</string>
<!--Settings Fragment -->
<string
name=
"settings_general_category"
>
Generali
</string>
...
...
app/src/main/res/values-nl/strings.xml
View file @
3c33f7d2
...
...
@@ -79,9 +79,6 @@
<string
name=
"no_magisk_msg"
>
Wilt u Magisk downloaden en installeren?
</string>
<!--URL Templates-->
<string
name=
"url_main"
>
https://api.github.com/orgs/Magisk-Modules-Repo/repos?access_token=
</string>
<string
name=
"file_url"
>
https://raw.githubusercontent.com/Magisk-Modules-Repo/%1$s/master/%2$s
</string>
<string
name=
"zip_url"
>
https://github.com/Magisk-Modules-Repo/%1$s/archive/master.zip
</string>
<!--Settings Fragment -->
<string
name=
"settings_general_category"
>
Algemeen
</string>
...
...
@@ -97,6 +94,7 @@
<string
name=
"settings_shell_logging_summary"
>
Schakel dit in om alle shell commands en output te loggen
</string>
<string
name=
"settings_magiskhide_title"
>
Magisk verbergen
</string>
<string
name=
"settings_magiskhide_summary"
>
Reboot om de instellingen toe te passen
</string>
<string
name=
"zip_install_unzip_zip_msg"
></string>
<!-- Strings related to Settings -->
...
...
app/src/main/res/values-pt/strings.xml
View file @
3c33f7d2
...
...
@@ -77,9 +77,6 @@
<string
name=
"no_magisk_msg"
>
Você quer baixar e instalar o Magisk?
</string>
<!--URL Templates-->
<string
name=
"url_main"
>
https://api.github.com/orgs/Magisk-Modules-Repo/repos?access_token=
</string>
<string
name=
"file_url"
>
https://raw.githubusercontent.com/Magisk-Modules-Repo/%1$s/master/%2$s
</string>
<string
name=
"zip_url"
>
https://github.com/Magisk-Modules-Repo/%1$s/archive/master.zip
</string>
<!--Settings Fragment -->
<string
name=
"settings_general_category"
>
Geral
</string>
...
...
app/src/main/res/values/strings.xml
View file @
3c33f7d2
...
...
@@ -86,9 +86,9 @@
<string
name=
"no_magisk_msg"
>
Do you want to download and install Magisk?
</string>
<!--URL Templates-->
<string
name=
"url_main"
>
https://api.github.com/orgs/Magisk-Modules-Repo/repos?access_token=
</string>
<string
name=
"file_url"
>
https://raw.githubusercontent.com/Magisk-Modules-Repo/%1$s/master/%2$s
</string>
<string
name=
"zip_url"
>
https://github.com/Magisk-Modules-Repo/%1$s/archive/master.zip
</string>
<string
name=
"url_main"
translatable=
"false"
>
https://api.github.com/orgs/Magisk-Modules-Repo/repos?access_token=%1$s
</string>
<string
name=
"file_url"
translatable=
"false"
>
https://raw.githubusercontent.com/Magisk-Modules-Repo/%1$s/master/%2$s
</string>
<string
name=
"zip_url"
translatable=
"false"
>
https://github.com/Magisk-Modules-Repo/%1$s/archive/master.zip
</string>
<!--Settings Activity -->
<string
name=
"settings_general_category"
>
General
</string>
...
...
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