MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stupid fix...

Browse Source
This commit is contained in:
topjohnwu 2016-09-28 00:36:58 +08:00
parent a173179b03
commit 160c6e6554
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/topjohnwu/magisk/LogFragment.java
View File

@ -40,7 +40,7 @@ import butterknife.ButterKnife;
public class LogFragment extends Fragment { 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.txtLog) TextView txtLog;
@BindView(R.id.svLog) ScrollView svLog; @BindView(R.id.svLog) ScrollView svLog;
@ -154,7 +154,7 @@ public class LogFragment extends Fragment {
Calendar now = Calendar.getInstance(); Calendar now = Calendar.getInstance();
String filename = String.format( 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.YEAR), now.get(Calendar.MONTH) + 1,
now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY), now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
now.get(Calendar.MINUTE), now.get(Calendar.SECOND)); now.get(Calendar.MINUTE), now.get(Calendar.SECOND));

4
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
View File

@ -98,7 +98,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
navigationView.setCheckedItem(R.id.downloads); navigationView.setCheckedItem(R.id.downloads);
} }
} }
hm = getFragmentManager().findFragmentByTag("dev"); hm = getFragmentManager().findFragmentByTag("log");
if (hm != null) { if (hm != null) {
if (hm.isVisible()) { if (hm.isVisible()) {
navigationView.setCheckedItem(R.id.log); navigationView.setCheckedItem(R.id.log);
@ -227,7 +227,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
break; break;
case R.id.log: case R.id.log:
setTitle(R.string.log); setTitle(R.string.log);
tag = "dev"; tag = "log";
navFragment = new LogFragment(); navFragment = new LogFragment();
break; break;
case R.id.settings: case R.id.settings:

2
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
View File

@ -254,8 +254,6 @@ public class Async {
e.printStackTrace(); e.printStackTrace();
return false; return false;
} }
Logger.dev(mName + "; " + mFile.getPath());
// return false;
if (Shell.rootAccess()) { if (Shell.rootAccess()) {
ret = Shell.su( ret = Shell.su(
"unzip -o " + mFile.getPath() + " META-INF/com/google/android/* -d " + mFile.getParent(), "unzip -o " + mFile.getPath() + " META-INF/com/google/android/* -d " + mFile.getParent(),