From c92f30b1223985fff11f44c5a5f2d7867ca7a1b8 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sat, 30 Sep 2017 03:04:23 +0800 Subject: [PATCH] Re-organize classes --- .../com/topjohnwu/magisk/FlashActivity.java | 32 +---------------- .../com/topjohnwu/magisk/MagiskManager.java | 2 +- .../com/topjohnwu/magisk/ModulesFragment.java | 2 +- .../topjohnwu/magisk/SuperuserFragment.java | 2 +- .../magisk/adapters/ModulesAdapter.java | 2 +- .../magisk/adapters/PolicyAdapter.java | 2 +- .../magisk/adapters/ReposAdapter.java | 4 +-- .../magisk/adapters/SuLogAdapter.java | 2 +- .../com/topjohnwu/magisk/asyncs/FlashZip.java | 6 ++-- .../topjohnwu/magisk/asyncs/HideManager.java | 2 +- .../magisk/asyncs/InstallMagisk.java | 12 +++---- .../topjohnwu/magisk/asyncs/LoadModules.java | 6 ++-- .../topjohnwu/magisk/asyncs/UpdateRepos.java | 4 +-- .../magisk/container/AdaptiveList.java | 36 +++++++++++++++++++ .../{module => container}/BaseModule.java | 2 +- .../magisk/{module => container}/Module.java | 2 +- .../{superuser => container}/Policy.java | 2 +- .../magisk/{module => container}/Repo.java | 2 +- .../{superuser => container}/SuLogEntry.java | 3 +- .../magisk/{utils => container}/TarEntry.java | 2 +- .../{utils => container}/ValueSortedMap.java | 2 +- .../magisk/database/RepoDatabaseHelper.java | 2 +- .../magisk/database/SuDatabaseHelper.java | 4 +-- .../magisk/receivers/PackageReceiver.java | 2 +- .../magisk/superuser/SuReceiver.java | 2 ++ .../magisk/superuser/SuRequestActivity.java | 1 + 26 files changed, 75 insertions(+), 65 deletions(-) create mode 100644 app/src/main/java/com/topjohnwu/magisk/container/AdaptiveList.java rename app/src/main/java/com/topjohnwu/magisk/{module => container}/BaseModule.java (98%) rename app/src/main/java/com/topjohnwu/magisk/{module => container}/Module.java (97%) rename app/src/main/java/com/topjohnwu/magisk/{superuser => container}/Policy.java (98%) rename app/src/main/java/com/topjohnwu/magisk/{module => container}/Repo.java (98%) rename app/src/main/java/com/topjohnwu/magisk/{superuser => container}/SuLogEntry.java (95%) rename app/src/main/java/com/topjohnwu/magisk/{utils => container}/TarEntry.java (98%) rename app/src/main/java/com/topjohnwu/magisk/{utils => container}/ValueSortedMap.java (95%) diff --git a/app/src/main/java/com/topjohnwu/magisk/FlashActivity.java b/app/src/main/java/com/topjohnwu/magisk/FlashActivity.java index edb8fa54f..589e8abef 100644 --- a/app/src/main/java/com/topjohnwu/magisk/FlashActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/FlashActivity.java @@ -16,9 +16,9 @@ import android.widget.TextView; import com.topjohnwu.magisk.asyncs.FlashZip; import com.topjohnwu.magisk.asyncs.InstallMagisk; import com.topjohnwu.magisk.components.Activity; +import com.topjohnwu.magisk.container.AdaptiveList; import com.topjohnwu.magisk.utils.Shell; -import java.util.ArrayList; import java.util.List; import butterknife.BindView; @@ -150,34 +150,4 @@ public class FlashActivity extends Activity { } } - public static class AdaptiveList extends ArrayList { - - 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; - } - } } diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java index 017a05098..5dad66674 100644 --- a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java +++ b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java @@ -22,7 +22,7 @@ import com.topjohnwu.magisk.asyncs.ParallelTask; import com.topjohnwu.magisk.asyncs.UpdateRepos; import com.topjohnwu.magisk.database.RepoDatabaseHelper; 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.superuser.SuReceiver; import com.topjohnwu.magisk.superuser.SuRequestActivity; diff --git a/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java b/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java index 76ce9944f..35b090517 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.topjohnwu.magisk.adapters.ModulesAdapter; import com.topjohnwu.magisk.asyncs.LoadModules; 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.Topic; diff --git a/app/src/main/java/com/topjohnwu/magisk/SuperuserFragment.java b/app/src/main/java/com/topjohnwu/magisk/SuperuserFragment.java index 4276b819f..a92d22c39 100644 --- a/app/src/main/java/com/topjohnwu/magisk/SuperuserFragment.java +++ b/app/src/main/java/com/topjohnwu/magisk/SuperuserFragment.java @@ -11,7 +11,7 @@ import android.widget.TextView; import com.topjohnwu.magisk.adapters.PolicyAdapter; import com.topjohnwu.magisk.components.Fragment; -import com.topjohnwu.magisk.superuser.Policy; +import com.topjohnwu.magisk.container.Policy; import java.util.List; diff --git a/app/src/main/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java b/app/src/main/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java index eaebdaa3a..5029664fc 100644 --- a/app/src/main/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java +++ b/app/src/main/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.topjohnwu.magisk.R; 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 java.util.List; diff --git a/app/src/main/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java b/app/src/main/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java index d006b1122..da9a1def5 100644 --- a/app/src/main/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java +++ b/app/src/main/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java @@ -16,7 +16,7 @@ import com.topjohnwu.magisk.components.AlertDialogBuilder; import com.topjohnwu.magisk.components.ExpandableView; import com.topjohnwu.magisk.components.SnackbarMaker; 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.List; diff --git a/app/src/main/java/com/topjohnwu/magisk/adapters/ReposAdapter.java b/app/src/main/java/com/topjohnwu/magisk/adapters/ReposAdapter.java index ad0bbfb68..714fc3d54 100644 --- a/app/src/main/java/com/topjohnwu/magisk/adapters/ReposAdapter.java +++ b/app/src/main/java/com/topjohnwu/magisk/adapters/ReposAdapter.java @@ -18,8 +18,8 @@ import com.topjohnwu.magisk.asyncs.MarkDownWindow; import com.topjohnwu.magisk.asyncs.ProcessRepoZip; import com.topjohnwu.magisk.components.AlertDialogBuilder; import com.topjohnwu.magisk.database.RepoDatabaseHelper; -import com.topjohnwu.magisk.module.Module; -import com.topjohnwu.magisk.module.Repo; +import com.topjohnwu.magisk.container.Module; +import com.topjohnwu.magisk.container.Repo; import com.topjohnwu.magisk.utils.Utils; import java.util.ArrayList; diff --git a/app/src/main/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java b/app/src/main/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java index cbe16667c..5a31cd569 100644 --- a/app/src/main/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java +++ b/app/src/main/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.components.ExpandableView; 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.HashSet; diff --git a/app/src/main/java/com/topjohnwu/magisk/asyncs/FlashZip.java b/app/src/main/java/com/topjohnwu/magisk/asyncs/FlashZip.java index ce5fc5e69..b21becd69 100644 --- a/app/src/main/java/com/topjohnwu/magisk/asyncs/FlashZip.java +++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/FlashZip.java @@ -4,9 +4,9 @@ import android.app.Activity; import android.net.Uri; import android.text.TextUtils; -import com.topjohnwu.magisk.FlashActivity; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; +import com.topjohnwu.magisk.container.AdaptiveList; import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.ZipUtils; @@ -24,9 +24,9 @@ public class FlashZip extends ParallelTask { private Uri mUri; private File mCachedFile; - private FlashActivity.AdaptiveList mList; + private AdaptiveList mList; - public FlashZip(Activity context, Uri uri, FlashActivity.AdaptiveList list) { + public FlashZip(Activity context, Uri uri, AdaptiveList list) { super(context); mUri = uri; mList = list; diff --git a/app/src/main/java/com/topjohnwu/magisk/asyncs/HideManager.java b/app/src/main/java/com/topjohnwu/magisk/asyncs/HideManager.java index 6413bc256..f513ae17c 100644 --- a/app/src/main/java/com/topjohnwu/magisk/asyncs/HideManager.java +++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/HideManager.java @@ -7,7 +7,7 @@ import android.widget.Toast; import com.topjohnwu.magisk.MagiskManager; 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.ZipUtils; diff --git a/app/src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java b/app/src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java index 9f8b535bf..ec78613b0 100644 --- a/app/src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java +++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java @@ -6,10 +6,10 @@ import android.os.Build; import android.os.Environment; import android.text.TextUtils; -import com.topjohnwu.magisk.FlashActivity; import com.topjohnwu.magisk.MagiskManager; +import com.topjohnwu.magisk.container.AdaptiveList; 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.ZipUtils; @@ -34,12 +34,12 @@ public class InstallMagisk extends ParallelTask { private static final int DIRECT_MODE = 1; private Uri mBootImg, mZip; - private FlashActivity.AdaptiveList mList; + private AdaptiveList mList; private String mBootLocation; private boolean mKeepEnc, mKeepVerity; private int mode; - private InstallMagisk(Activity context, FlashActivity.AdaptiveList list, Uri zip, boolean enc, boolean verity) { + private InstallMagisk(Activity context, AdaptiveList list, Uri zip, boolean enc, boolean verity) { super(context); mList = list; mZip = zip; @@ -47,13 +47,13 @@ public class InstallMagisk extends ParallelTask { mKeepVerity = verity; } - public InstallMagisk(Activity context, FlashActivity.AdaptiveList list, Uri zip, boolean enc, boolean verity, Uri boot) { + public InstallMagisk(Activity context, AdaptiveList list, Uri zip, boolean enc, boolean verity, Uri boot) { this(context, list, zip, enc, verity); mBootImg = boot; mode = PATCH_MODE; } - public InstallMagisk(Activity context, FlashActivity.AdaptiveList list, Uri zip, boolean enc, boolean verity, String boot) { + public InstallMagisk(Activity context, AdaptiveList list, Uri zip, boolean enc, boolean verity, String boot) { this(context, list, zip, enc, verity); mBootLocation = boot; mode = DIRECT_MODE; diff --git a/app/src/main/java/com/topjohnwu/magisk/asyncs/LoadModules.java b/app/src/main/java/com/topjohnwu/magisk/asyncs/LoadModules.java index 6d3d62145..8ccc19362 100644 --- a/app/src/main/java/com/topjohnwu/magisk/asyncs/LoadModules.java +++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/LoadModules.java @@ -3,11 +3,11 @@ package com.topjohnwu.magisk.asyncs; import android.content.Context; import com.topjohnwu.magisk.MagiskManager; -import com.topjohnwu.magisk.module.BaseModule; -import com.topjohnwu.magisk.module.Module; +import com.topjohnwu.magisk.container.BaseModule; +import com.topjohnwu.magisk.container.Module; import com.topjohnwu.magisk.utils.Logger; import com.topjohnwu.magisk.utils.Utils; -import com.topjohnwu.magisk.utils.ValueSortedMap; +import com.topjohnwu.magisk.container.ValueSortedMap; public class LoadModules extends ParallelTask { diff --git a/app/src/main/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java b/app/src/main/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java index 4b7fe9ca2..5fec33075 100644 --- a/app/src/main/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java +++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java @@ -7,8 +7,8 @@ import android.text.TextUtils; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.ReposFragment; import com.topjohnwu.magisk.database.RepoDatabaseHelper; -import com.topjohnwu.magisk.module.BaseModule; -import com.topjohnwu.magisk.module.Repo; +import com.topjohnwu.magisk.container.BaseModule; +import com.topjohnwu.magisk.container.Repo; import com.topjohnwu.magisk.utils.Logger; import com.topjohnwu.magisk.utils.WebService; diff --git a/app/src/main/java/com/topjohnwu/magisk/container/AdaptiveList.java b/app/src/main/java/com/topjohnwu/magisk/container/AdaptiveList.java new file mode 100644 index 000000000..f92d79511 --- /dev/null +++ b/app/src/main/java/com/topjohnwu/magisk/container/AdaptiveList.java @@ -0,0 +1,36 @@ +package com.topjohnwu.magisk.container; + +import android.support.v7.widget.RecyclerView; + +import java.util.ArrayList; + +public class AdaptiveList extends ArrayList { + + 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; + } +} diff --git a/app/src/main/java/com/topjohnwu/magisk/module/BaseModule.java b/app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java similarity index 98% rename from app/src/main/java/com/topjohnwu/magisk/module/BaseModule.java rename to app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java index 3463fbb04..dd24d822c 100644 --- a/app/src/main/java/com/topjohnwu/magisk/module/BaseModule.java +++ b/app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.module; +package com.topjohnwu.magisk.container; import android.database.Cursor; diff --git a/app/src/main/java/com/topjohnwu/magisk/module/Module.java b/app/src/main/java/com/topjohnwu/magisk/container/Module.java similarity index 97% rename from app/src/main/java/com/topjohnwu/magisk/module/Module.java rename to app/src/main/java/com/topjohnwu/magisk/container/Module.java index 079c90b6f..889a12e58 100644 --- a/app/src/main/java/com/topjohnwu/magisk/module/Module.java +++ b/app/src/main/java/com/topjohnwu/magisk/container/Module.java @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.module; +package com.topjohnwu.magisk.container; import com.topjohnwu.magisk.utils.Logger; import com.topjohnwu.magisk.utils.Shell; diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java b/app/src/main/java/com/topjohnwu/magisk/container/Policy.java similarity index 98% rename from app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java rename to app/src/main/java/com/topjohnwu/magisk/container/Policy.java index 6580978c6..c0cf1594c 100644 --- a/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java +++ b/app/src/main/java/com/topjohnwu/magisk/container/Policy.java @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.superuser; +package com.topjohnwu.magisk.container; import android.content.ContentValues; import android.content.pm.ApplicationInfo; diff --git a/app/src/main/java/com/topjohnwu/magisk/module/Repo.java b/app/src/main/java/com/topjohnwu/magisk/container/Repo.java similarity index 98% rename from app/src/main/java/com/topjohnwu/magisk/module/Repo.java rename to app/src/main/java/com/topjohnwu/magisk/container/Repo.java index b7f6bdcbc..eb501a348 100644 --- a/app/src/main/java/com/topjohnwu/magisk/module/Repo.java +++ b/app/src/main/java/com/topjohnwu/magisk/container/Repo.java @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.module; +package com.topjohnwu.magisk.container; import android.content.ContentValues; import android.database.Cursor; diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/SuLogEntry.java b/app/src/main/java/com/topjohnwu/magisk/container/SuLogEntry.java similarity index 95% rename from app/src/main/java/com/topjohnwu/magisk/superuser/SuLogEntry.java rename to app/src/main/java/com/topjohnwu/magisk/container/SuLogEntry.java index 674c16daa..35a01ff64 100644 --- a/app/src/main/java/com/topjohnwu/magisk/superuser/SuLogEntry.java +++ b/app/src/main/java/com/topjohnwu/magisk/container/SuLogEntry.java @@ -1,9 +1,10 @@ -package com.topjohnwu.magisk.superuser; +package com.topjohnwu.magisk.container; import android.content.ContentValues; import android.database.Cursor; import com.topjohnwu.magisk.MagiskManager; +import com.topjohnwu.magisk.container.Policy; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/TarEntry.java b/app/src/main/java/com/topjohnwu/magisk/container/TarEntry.java similarity index 98% rename from app/src/main/java/com/topjohnwu/magisk/utils/TarEntry.java rename to app/src/main/java/com/topjohnwu/magisk/container/TarEntry.java index 523794efb..2a09ddd39 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/TarEntry.java +++ b/app/src/main/java/com/topjohnwu/magisk/container/TarEntry.java @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.utils; +package com.topjohnwu.magisk.container; import org.kamranzafar.jtar.TarHeader; diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/ValueSortedMap.java b/app/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java similarity index 95% rename from app/src/main/java/com/topjohnwu/magisk/utils/ValueSortedMap.java rename to app/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java index 5313df3b8..dccd6105c 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/ValueSortedMap.java +++ b/app/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java @@ -1,4 +1,4 @@ -package com.topjohnwu.magisk.utils; +package com.topjohnwu.magisk.container; import android.support.annotation.NonNull; diff --git a/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java b/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java index 0eac2cfe1..c845f5849 100644 --- a/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java +++ b/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java @@ -6,7 +6,7 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; 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.Utils; diff --git a/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java b/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java index eacc1e39e..d1f87bea4 100644 --- a/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java +++ b/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java @@ -10,8 +10,8 @@ import android.database.sqlite.SQLiteOpenHelper; import android.text.TextUtils; import com.topjohnwu.magisk.MagiskManager; -import com.topjohnwu.magisk.superuser.Policy; -import com.topjohnwu.magisk.superuser.SuLogEntry; +import com.topjohnwu.magisk.container.Policy; +import com.topjohnwu.magisk.container.SuLogEntry; import com.topjohnwu.magisk.utils.Utils; import java.io.File; diff --git a/app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java b/app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java index 4b5e829d2..828135493 100644 --- a/app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java +++ b/app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java @@ -5,7 +5,7 @@ import android.content.Context; import android.content.Intent; import com.topjohnwu.magisk.MagiskManager; -import com.topjohnwu.magisk.superuser.Policy; +import com.topjohnwu.magisk.container.Policy; import com.topjohnwu.magisk.utils.Utils; public class PackageReceiver extends BroadcastReceiver { diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java b/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java index 02e8b0097..167d90305 100644 --- a/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java +++ b/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java @@ -9,6 +9,8 @@ import android.widget.Toast; import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; +import com.topjohnwu.magisk.container.Policy; +import com.topjohnwu.magisk.container.SuLogEntry; import java.util.Date; diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java b/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java index 83d7819bb..92a196b52 100644 --- a/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java @@ -21,6 +21,7 @@ import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.asyncs.ParallelTask; import com.topjohnwu.magisk.components.Activity; +import com.topjohnwu.magisk.container.Policy; import java.io.DataInputStream; import java.io.IOException;