From 160c6e65545842aa7ee6bb771b481d3c215bde09 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Wed, 28 Sep 2016 00:36:58 +0800 Subject: [PATCH] Stupid fix... --- app/src/main/java/com/topjohnwu/magisk/LogFragment.java | 4 ++-- app/src/main/java/com/topjohnwu/magisk/MainActivity.java | 4 ++-- app/src/main/java/com/topjohnwu/magisk/utils/Async.java | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/LogFragment.java b/app/src/main/java/com/topjohnwu/magisk/LogFragment.java index cc2d878e6..1b70f7d04 100644 --- a/app/src/main/java/com/topjohnwu/magisk/LogFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/LogFragment.java @@ -40,7 +40,7 @@ import butterknife.ButterKnife; public class LogFragment extends Fragment { - private static final String MAGISK_LOG = "/cache/magisk.dev"; + private static final String MAGISK_LOG = "/cache/magisk.log"; @BindView(R.id.txtLog) TextView txtLog; @BindView(R.id.svLog) ScrollView svLog; @@ -154,7 +154,7 @@ public class LogFragment extends Fragment { Calendar now = Calendar.getInstance(); String filename = String.format( - "magisk_%s_%04d%02d%02d_%02d%02d%02d.dev", "error", + "magisk_%s_%04d%02d%02d_%02d%02d%02d.log", "error", now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1, now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY), now.get(Calendar.MINUTE), now.get(Calendar.SECOND)); diff --git a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java index 57fe2227a..b9cd163e5 100644 --- a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java @@ -98,7 +98,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On navigationView.setCheckedItem(R.id.downloads); } } - hm = getFragmentManager().findFragmentByTag("dev"); + hm = getFragmentManager().findFragmentByTag("log"); if (hm != null) { if (hm.isVisible()) { navigationView.setCheckedItem(R.id.log); @@ -227,7 +227,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On break; case R.id.log: setTitle(R.string.log); - tag = "dev"; + tag = "log"; navFragment = new LogFragment(); break; case R.id.settings: diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Async.java b/app/src/main/java/com/topjohnwu/magisk/utils/Async.java index 53816f27f..cb33af841 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/Async.java +++ b/app/src/main/java/com/topjohnwu/magisk/utils/Async.java @@ -254,8 +254,6 @@ public class Async { e.printStackTrace(); return false; } - Logger.dev(mName + "; " + mFile.getPath()); -// return false; if (Shell.rootAccess()) { ret = Shell.su( "unzip -o " + mFile.getPath() + " META-INF/com/google/android/* -d " + mFile.getParent(),