From 615bbcae7432c9d0efa3860f854124f25bffad71 Mon Sep 17 00:00:00 2001 From: dvdandroid Date: Wed, 17 Aug 2016 12:01:58 +0200 Subject: [PATCH] Refactoring --- .gitignore | 5 +- .idea/compiler.xml | 4 +- .idea/copyright/profiles_settings.xml | 3 - .idea/gradle.xml | 2 +- .idea/misc.xml | 59 ++++++++- app/build.gradle | 5 +- .../com/topjohnwu/magisk/MainActivity.java | 117 +++++++----------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 9 files changed, 117 insertions(+), 84 deletions(-) delete mode 100644 .idea/copyright/profiles_settings.xml diff --git a/.gitignore b/.gitignore index c6cbe562a..1fe4b4f12 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,5 @@ *.iml .gradle /local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store +/.idea/ /build -/captures diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43efa..b42dd7204 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,7 @@ + + + + + + + Android Lint + + + Groovy + + + HTML + + + J2ME issues + + + JUnit issues + + + Java language level issues + + + JavaBeans issues + + + Pattern Validation + + + Threading issues + + + Threading issuesGroovy + + + XML + + + + + @@ -37,10 +78,26 @@ - + + + + + + 1.8 + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f73ce5ad7..1e00d1ff1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,10 @@ android { targetSdkVersion 24 versionCode 3 versionName "v4" + + jackOptions { + enabled true + } } buildTypes { release { @@ -21,5 +25,4 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' } diff --git a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java index 5fff5f685..f20c44580 100644 --- a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java @@ -5,10 +5,9 @@ import android.graphics.Color; import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; -import android.util.Log; -import android.view.View; import android.widget.Switch; import android.widget.TextView; + import java.io.BufferedReader; import java.io.DataOutputStream; import java.io.File; @@ -21,6 +20,41 @@ public class MainActivity extends Activity { private TextView magiskVersion, rootStatus, selinuxStatus, safetyNet, permissive; private String suPath; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + magiskVersion = (TextView) findViewById(R.id.magisk_version); + rootToggle = (Switch) findViewById(R.id.root_toggle); + selinuxToggle = (Switch) findViewById(R.id.selinux_toggle); + rootStatus = (TextView) findViewById(R.id.root_status); + selinuxStatus = (TextView) findViewById(R.id.selinux_status); + safetyNet = (TextView) findViewById(R.id.safety_net); + permissive = (TextView) findViewById(R.id.permissive); + + suPath = execute("getprop magisk.supath"); + updateStatus(); + + rootToggle.setOnClickListener(view -> { + Switch s = (Switch) view; + if (s.isChecked()) { + (new SU()).execute("setprop magisk.root 1"); + } else { + (new SU()).execute("setprop magisk.root 0"); + } + }); + + selinuxToggle.setOnClickListener(view -> { + Switch s = (Switch) view; + if (s.isChecked()) { + new SU().execute("setenforce 1"); + } else { + new SU().execute("setenforce 0"); + } + }); + } + private String execute(String command) { StringBuilder output = new StringBuilder(); @@ -32,8 +66,8 @@ public class MainActivity extends Activity { BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream())); String line; - while ((line = reader.readLine())!= null) { - if(output.length() != 0) output.append("\n"); + while ((line = reader.readLine()) != null) { + if (output.length() != 0) output.append("\n"); output.append(line); } @@ -50,7 +84,7 @@ public class MainActivity extends Activity { magiskVersion.setText(getString(R.string.magisk_version, execute("getprop magisk.version"))); selinuxStatus.setText(selinux); - if(selinux.equals("Enforcing")) { + if (selinux.equals("Enforcing")) { selinuxStatus.setTextColor(Color.GREEN); selinuxToggle.setChecked(true); permissive.setText(R.string.selinux_enforcing_info); @@ -62,17 +96,17 @@ public class MainActivity extends Activity { permissive.setTextColor(Color.RED); } - if((new File("/system/framework/twframework.jar")).exists()) { + if (new File("/system/framework/twframework.jar").exists()) { selinuxToggle.setEnabled(false); permissive.setText(R.string.selinux_samsung); } - if((new File("/system/xbin/su").exists())) { + if (new File("/system/xbin/su").exists()) { rootStatus.setTextColor(Color.RED); safetyNet.setTextColor(Color.RED); rootToggle.setChecked(true); - if(!(new File(suPath + "/su")).exists()) { + if (!(new File(suPath + "/su")).exists()) { rootStatus.setText(R.string.root_system); safetyNet.setText(R.string.root_system_info); rootToggle.setEnabled(false); @@ -86,7 +120,7 @@ public class MainActivity extends Activity { safetyNet.setTextColor(Color.GREEN); rootToggle.setChecked(false); - if(!(new File(suPath + "/su")).exists()) { + if (!new File(suPath + "/su").exists()) { rootStatus.setText(R.string.root_none); safetyNet.setText(R.string.root_none_info); rootToggle.setEnabled(false); @@ -105,77 +139,22 @@ public class MainActivity extends Activity { try { Process su = Runtime.getRuntime().exec(suPath + "/su"); DataOutputStream out = new DataOutputStream(su.getOutputStream()); - for(String command : params) { + for (String command : params) { out.writeBytes(command + "\n"); out.flush(); } out.writeBytes("exit\n"); out.flush(); - } catch (IOException e) { e.printStackTrace(); } + } catch (IOException e) { + e.printStackTrace(); + } return null; } @Override protected void onPostExecute(Void aVoid) { final Handler handler = new Handler(); - handler.postDelayed(new Runnable() { - @Override - public void run() { - updateStatus(); - } - }, 1500); + handler.postDelayed(MainActivity.this::updateStatus, 1500); } } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - magiskVersion = (TextView) findViewById(R.id.magisk_version); - rootToggle = (Switch) findViewById(R.id.root_toggle); - selinuxToggle = (Switch) findViewById(R.id.selinux_toggle); - rootStatus = (TextView) findViewById(R.id.root_status); - selinuxStatus = (TextView) findViewById(R.id.selinux_status); - safetyNet = (TextView) findViewById(R.id.safety_net); - permissive = (TextView) findViewById(R.id.permissive); - - suPath = execute("getprop magisk.supath"); - - setContentView(R.layout.activity_main); - - magiskVersion = (TextView) findViewById(R.id.magisk_version); - rootToggle = (Switch) findViewById(R.id.root_toggle); - selinuxToggle = (Switch) findViewById(R.id.selinux_toggle); - rootStatus = (TextView) findViewById(R.id.root_status); - selinuxStatus = (TextView) findViewById(R.id.selinux_status); - safetyNet = (TextView) findViewById(R.id.safety_net); - permissive = (TextView) findViewById(R.id.permissive); - - updateStatus(); - - rootToggle.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Switch s = (Switch) view; - if(s.isChecked()) { - (new SU()).execute("setprop magisk.root 1"); - } else { - (new SU()).execute("setprop magisk.root 0"); - } - } - }); - - selinuxToggle.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Switch s = (Switch) view; - if(s.isChecked()) { - (new SU()).execute("setenforce 1"); - } else { - (new SU()).execute("setenforce 0"); - } - } - }); - } } diff --git a/build.gradle b/build.gradle index aff4f415e..77ce66ea3 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 122a0dca2..38f9c02c2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed Aug 17 11:39:12 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip