Commit c92f30b1 authored by topjohnwu's avatar topjohnwu

Re-organize classes

parent 294ad094
...@@ -16,9 +16,9 @@ import android.widget.TextView; ...@@ -16,9 +16,9 @@ import android.widget.TextView;
import com.topjohnwu.magisk.asyncs.FlashZip; import com.topjohnwu.magisk.asyncs.FlashZip;
import com.topjohnwu.magisk.asyncs.InstallMagisk; import com.topjohnwu.magisk.asyncs.InstallMagisk;
import com.topjohnwu.magisk.components.Activity; import com.topjohnwu.magisk.components.Activity;
import com.topjohnwu.magisk.container.AdaptiveList;
import com.topjohnwu.magisk.utils.Shell; import com.topjohnwu.magisk.utils.Shell;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import butterknife.BindView; import butterknife.BindView;
...@@ -150,34 +150,4 @@ public class FlashActivity extends Activity { ...@@ -150,34 +150,4 @@ public class FlashActivity extends Activity {
} }
} }
public static class AdaptiveList<E> extends ArrayList<E> {
private Runnable callback;
private RecyclerView mView;
public AdaptiveList(RecyclerView v) {
mView = v;
}
public void updateView() {
mView.getAdapter().notifyDataSetChanged();
mView.scrollToPosition(mView.getAdapter().getItemCount() - 1);
}
public void setCallback(Runnable cb) {
callback = cb;
}
public boolean add(E e) {
boolean ret = super.add(e);
if (ret) {
if (callback == null) {
updateView();
} else {
callback.run();
}
}
return ret;
}
}
} }
...@@ -22,7 +22,7 @@ import com.topjohnwu.magisk.asyncs.ParallelTask; ...@@ -22,7 +22,7 @@ import com.topjohnwu.magisk.asyncs.ParallelTask;
import com.topjohnwu.magisk.asyncs.UpdateRepos; import com.topjohnwu.magisk.asyncs.UpdateRepos;
import com.topjohnwu.magisk.database.RepoDatabaseHelper; import com.topjohnwu.magisk.database.RepoDatabaseHelper;
import com.topjohnwu.magisk.database.SuDatabaseHelper; import com.topjohnwu.magisk.database.SuDatabaseHelper;
import com.topjohnwu.magisk.module.Module; import com.topjohnwu.magisk.container.Module;
import com.topjohnwu.magisk.services.UpdateCheckService; import com.topjohnwu.magisk.services.UpdateCheckService;
import com.topjohnwu.magisk.superuser.SuReceiver; import com.topjohnwu.magisk.superuser.SuReceiver;
import com.topjohnwu.magisk.superuser.SuRequestActivity; import com.topjohnwu.magisk.superuser.SuRequestActivity;
......
...@@ -14,7 +14,7 @@ import android.widget.TextView; ...@@ -14,7 +14,7 @@ import android.widget.TextView;
import com.topjohnwu.magisk.adapters.ModulesAdapter; import com.topjohnwu.magisk.adapters.ModulesAdapter;
import com.topjohnwu.magisk.asyncs.LoadModules; import com.topjohnwu.magisk.asyncs.LoadModules;
import com.topjohnwu.magisk.components.Fragment; import com.topjohnwu.magisk.components.Fragment;
import com.topjohnwu.magisk.module.Module; import com.topjohnwu.magisk.container.Module;
import com.topjohnwu.magisk.utils.Logger; import com.topjohnwu.magisk.utils.Logger;
import com.topjohnwu.magisk.utils.Topic; import com.topjohnwu.magisk.utils.Topic;
......
...@@ -11,7 +11,7 @@ import android.widget.TextView; ...@@ -11,7 +11,7 @@ import android.widget.TextView;
import com.topjohnwu.magisk.adapters.PolicyAdapter; import com.topjohnwu.magisk.adapters.PolicyAdapter;
import com.topjohnwu.magisk.components.Fragment; import com.topjohnwu.magisk.components.Fragment;
import com.topjohnwu.magisk.superuser.Policy; import com.topjohnwu.magisk.container.Policy;
import java.util.List; import java.util.List;
......
...@@ -13,7 +13,7 @@ import android.widget.TextView; ...@@ -13,7 +13,7 @@ import android.widget.TextView;
import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.components.SnackbarMaker; import com.topjohnwu.magisk.components.SnackbarMaker;
import com.topjohnwu.magisk.module.Module; import com.topjohnwu.magisk.container.Module;
import com.topjohnwu.magisk.utils.Shell; import com.topjohnwu.magisk.utils.Shell;
import java.util.List; import java.util.List;
......
...@@ -16,7 +16,7 @@ import com.topjohnwu.magisk.components.AlertDialogBuilder; ...@@ -16,7 +16,7 @@ import com.topjohnwu.magisk.components.AlertDialogBuilder;
import com.topjohnwu.magisk.components.ExpandableView; import com.topjohnwu.magisk.components.ExpandableView;
import com.topjohnwu.magisk.components.SnackbarMaker; import com.topjohnwu.magisk.components.SnackbarMaker;
import com.topjohnwu.magisk.database.SuDatabaseHelper; import com.topjohnwu.magisk.database.SuDatabaseHelper;
import com.topjohnwu.magisk.superuser.Policy; import com.topjohnwu.magisk.container.Policy;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
......
...@@ -18,8 +18,8 @@ import com.topjohnwu.magisk.asyncs.MarkDownWindow; ...@@ -18,8 +18,8 @@ import com.topjohnwu.magisk.asyncs.MarkDownWindow;
import com.topjohnwu.magisk.asyncs.ProcessRepoZip; import com.topjohnwu.magisk.asyncs.ProcessRepoZip;
import com.topjohnwu.magisk.components.AlertDialogBuilder; import com.topjohnwu.magisk.components.AlertDialogBuilder;
import com.topjohnwu.magisk.database.RepoDatabaseHelper; import com.topjohnwu.magisk.database.RepoDatabaseHelper;
import com.topjohnwu.magisk.module.Module; import com.topjohnwu.magisk.container.Module;
import com.topjohnwu.magisk.module.Repo; import com.topjohnwu.magisk.container.Repo;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;
import java.util.ArrayList; import java.util.ArrayList;
......
...@@ -13,7 +13,7 @@ import android.widget.TextView; ...@@ -13,7 +13,7 @@ import android.widget.TextView;
import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.components.ExpandableView; import com.topjohnwu.magisk.components.ExpandableView;
import com.topjohnwu.magisk.database.SuDatabaseHelper; import com.topjohnwu.magisk.database.SuDatabaseHelper;
import com.topjohnwu.magisk.superuser.SuLogEntry; import com.topjohnwu.magisk.container.SuLogEntry;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
......
...@@ -4,9 +4,9 @@ import android.app.Activity; ...@@ -4,9 +4,9 @@ import android.app.Activity;
import android.net.Uri; import android.net.Uri;
import android.text.TextUtils; import android.text.TextUtils;
import com.topjohnwu.magisk.FlashActivity;
import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.container.AdaptiveList;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;
import com.topjohnwu.magisk.utils.ZipUtils; import com.topjohnwu.magisk.utils.ZipUtils;
...@@ -24,9 +24,9 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> { ...@@ -24,9 +24,9 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> {
private Uri mUri; private Uri mUri;
private File mCachedFile; private File mCachedFile;
private FlashActivity.AdaptiveList<String> mList; private AdaptiveList<String> mList;
public FlashZip(Activity context, Uri uri, FlashActivity.AdaptiveList<String> list) { public FlashZip(Activity context, Uri uri, AdaptiveList<String> list) {
super(context); super(context);
mUri = uri; mUri = uri;
mList = list; mList = list;
......
...@@ -7,7 +7,7 @@ import android.widget.Toast; ...@@ -7,7 +7,7 @@ import android.widget.Toast;
import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.superuser.Policy; import com.topjohnwu.magisk.container.Policy;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;
import com.topjohnwu.magisk.utils.ZipUtils; import com.topjohnwu.magisk.utils.ZipUtils;
......
...@@ -6,10 +6,10 @@ import android.os.Build; ...@@ -6,10 +6,10 @@ import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.text.TextUtils; import android.text.TextUtils;
import com.topjohnwu.magisk.FlashActivity;
import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.container.AdaptiveList;
import com.topjohnwu.magisk.utils.Shell; import com.topjohnwu.magisk.utils.Shell;
import com.topjohnwu.magisk.utils.TarEntry; import com.topjohnwu.magisk.container.TarEntry;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;
import com.topjohnwu.magisk.utils.ZipUtils; import com.topjohnwu.magisk.utils.ZipUtils;
...@@ -34,12 +34,12 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> { ...@@ -34,12 +34,12 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
private static final int DIRECT_MODE = 1; private static final int DIRECT_MODE = 1;
private Uri mBootImg, mZip; private Uri mBootImg, mZip;
private FlashActivity.AdaptiveList<String> mList; private AdaptiveList<String> mList;
private String mBootLocation; private String mBootLocation;
private boolean mKeepEnc, mKeepVerity; private boolean mKeepEnc, mKeepVerity;
private int mode; private int mode;
private InstallMagisk(Activity context, FlashActivity.AdaptiveList<String> list, Uri zip, boolean enc, boolean verity) { private InstallMagisk(Activity context, AdaptiveList<String> list, Uri zip, boolean enc, boolean verity) {
super(context); super(context);
mList = list; mList = list;
mZip = zip; mZip = zip;
...@@ -47,13 +47,13 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> { ...@@ -47,13 +47,13 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
mKeepVerity = verity; mKeepVerity = verity;
} }
public InstallMagisk(Activity context, FlashActivity.AdaptiveList<String> list, Uri zip, boolean enc, boolean verity, Uri boot) { public InstallMagisk(Activity context, AdaptiveList<String> list, Uri zip, boolean enc, boolean verity, Uri boot) {
this(context, list, zip, enc, verity); this(context, list, zip, enc, verity);
mBootImg = boot; mBootImg = boot;
mode = PATCH_MODE; mode = PATCH_MODE;
} }
public InstallMagisk(Activity context, FlashActivity.AdaptiveList<String> list, Uri zip, boolean enc, boolean verity, String boot) { public InstallMagisk(Activity context, AdaptiveList<String> list, Uri zip, boolean enc, boolean verity, String boot) {
this(context, list, zip, enc, verity); this(context, list, zip, enc, verity);
mBootLocation = boot; mBootLocation = boot;
mode = DIRECT_MODE; mode = DIRECT_MODE;
......
...@@ -3,11 +3,11 @@ package com.topjohnwu.magisk.asyncs; ...@@ -3,11 +3,11 @@ package com.topjohnwu.magisk.asyncs;
import android.content.Context; import android.content.Context;
import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.module.BaseModule; import com.topjohnwu.magisk.container.BaseModule;
import com.topjohnwu.magisk.module.Module; import com.topjohnwu.magisk.container.Module;
import com.topjohnwu.magisk.utils.Logger; import com.topjohnwu.magisk.utils.Logger;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;
import com.topjohnwu.magisk.utils.ValueSortedMap; import com.topjohnwu.magisk.container.ValueSortedMap;
public class LoadModules extends ParallelTask<Void, Void, Void> { public class LoadModules extends ParallelTask<Void, Void, Void> {
......
...@@ -7,8 +7,8 @@ import android.text.TextUtils; ...@@ -7,8 +7,8 @@ import android.text.TextUtils;
import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.ReposFragment; import com.topjohnwu.magisk.ReposFragment;
import com.topjohnwu.magisk.database.RepoDatabaseHelper; import com.topjohnwu.magisk.database.RepoDatabaseHelper;
import com.topjohnwu.magisk.module.BaseModule; import com.topjohnwu.magisk.container.BaseModule;
import com.topjohnwu.magisk.module.Repo; import com.topjohnwu.magisk.container.Repo;
import com.topjohnwu.magisk.utils.Logger; import com.topjohnwu.magisk.utils.Logger;
import com.topjohnwu.magisk.utils.WebService; import com.topjohnwu.magisk.utils.WebService;
......
package com.topjohnwu.magisk.container;
import android.support.v7.widget.RecyclerView;
import java.util.ArrayList;
public class AdaptiveList<E> extends ArrayList<E> {
private Runnable callback;
private RecyclerView mView;
public AdaptiveList(RecyclerView v) {
mView = v;
}
public void updateView() {
mView.getAdapter().notifyDataSetChanged();
mView.scrollToPosition(mView.getAdapter().getItemCount() - 1);
}
public void setCallback(Runnable cb) {
callback = cb;
}
public boolean add(E e) {
boolean ret = super.add(e);
if (ret) {
if (callback == null) {
updateView();
} else {
callback.run();
}
}
return ret;
}
}
package com.topjohnwu.magisk.module; package com.topjohnwu.magisk.container;
import android.database.Cursor; import android.database.Cursor;
......
package com.topjohnwu.magisk.module; package com.topjohnwu.magisk.container;
import com.topjohnwu.magisk.utils.Logger; import com.topjohnwu.magisk.utils.Logger;
import com.topjohnwu.magisk.utils.Shell; import com.topjohnwu.magisk.utils.Shell;
......
package com.topjohnwu.magisk.superuser; package com.topjohnwu.magisk.container;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
......
package com.topjohnwu.magisk.module; package com.topjohnwu.magisk.container;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
......
package com.topjohnwu.magisk.superuser; package com.topjohnwu.magisk.container;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.container.Policy;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
......
package com.topjohnwu.magisk.utils; package com.topjohnwu.magisk.container;
import org.kamranzafar.jtar.TarHeader; import org.kamranzafar.jtar.TarHeader;
......
package com.topjohnwu.magisk.utils; package com.topjohnwu.magisk.container;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
......
...@@ -6,7 +6,7 @@ import android.database.sqlite.SQLiteDatabase; ...@@ -6,7 +6,7 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.module.Repo; import com.topjohnwu.magisk.container.Repo;
import com.topjohnwu.magisk.utils.Logger; import com.topjohnwu.magisk.utils.Logger;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;
......
...@@ -10,8 +10,8 @@ import android.database.sqlite.SQLiteOpenHelper; ...@@ -10,8 +10,8 @@ import android.database.sqlite.SQLiteOpenHelper;
import android.text.TextUtils; import android.text.TextUtils;
import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.superuser.Policy; import com.topjohnwu.magisk.container.Policy;
import com.topjohnwu.magisk.superuser.SuLogEntry; import com.topjohnwu.magisk.container.SuLogEntry;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;
import java.io.File; import java.io.File;
......
...@@ -5,7 +5,7 @@ import android.content.Context; ...@@ -5,7 +5,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.superuser.Policy; import com.topjohnwu.magisk.container.Policy;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;
public class PackageReceiver extends BroadcastReceiver { public class PackageReceiver extends BroadcastReceiver {
......
...@@ -9,6 +9,8 @@ import android.widget.Toast; ...@@ -9,6 +9,8 @@ import android.widget.Toast;
import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.container.Policy;
import com.topjohnwu.magisk.container.SuLogEntry;
import java.util.Date; import java.util.Date;
......
...@@ -21,6 +21,7 @@ import com.topjohnwu.magisk.MagiskManager; ...@@ -21,6 +21,7 @@ import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.asyncs.ParallelTask; import com.topjohnwu.magisk.asyncs.ParallelTask;
import com.topjohnwu.magisk.components.Activity; import com.topjohnwu.magisk.components.Activity;
import com.topjohnwu.magisk.container.Policy;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment