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

Small refactoring fixes

Browse Source
This commit is contained in:
topjohnwu 2018-12-13 06:05:19 -05:00
parent bce9cfa39a
commit fd7786633d
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/full/java/com/topjohnwu/magisk/components/BaseFragment.java
View File

@ -10,13 +10,9 @@ import butterknife.Unbinder;
public class BaseFragment extends Fragment implements Topic.AutoSubscriber { public class BaseFragment extends Fragment implements Topic.AutoSubscriber {
public App app; public App app = App.self;
protected Unbinder unbinder = null; protected Unbinder unbinder = null;
public BaseFragment() {
app = App.self;
}
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();

2
core/src/main/java/com/topjohnwu/core/database/MagiskDB.java
View File

@ -23,7 +23,7 @@ import java.util.Map;
public class MagiskDB { public class MagiskDB {
private static final String POLICY_TABLE = "policies"; private static final String POLICY_TABLE = "policies";
private static final String LOG_TABLE = "err"; private static final String LOG_TABLE = "logs";
private static final String SETTINGS_TABLE = "settings"; private static final String SETTINGS_TABLE = "settings";
private static final String STRINGS_TABLE = "strings"; private static final String STRINGS_TABLE = "strings";

6
core/src/main/res/raw/utils.sh
View File

@ -63,9 +63,9 @@ restore_imgs() {
post_ota() { post_ota() {
cd $1 cd $1
chmod 755 bootctl chmod 755 bootctl
../../../../../app/src/full/res/raw/bootctl hal-info || return ./bootctl hal-info || return
[ `../../../../../app/src/full/res/raw/bootctl get-current-slot` -eq 0 ] && SLOT_NUM=1 || SLOT_NUM=0 [ `./bootctl get-current-slot` -eq 0 ] && SLOT_NUM=1 || SLOT_NUM=0
../../../../../app/src/full/res/raw/bootctl set-active-boot-slot $SLOT_NUM ./bootctl set-active-boot-slot $SLOT_NUM
echo '${0%/*}/../bootctl mark-boot-successful;rm -f ${0%/*}/../bootctl $0' > post-fs-data.d/post_ota.sh echo '${0%/*}/../bootctl mark-boot-successful;rm -f ${0%/*}/../bootctl $0' > post-fs-data.d/post_ota.sh
chmod 755 post-fs-data.d/post_ota.sh chmod 755 post-fs-data.d/post_ota.sh
cd / cd /