From fd7786633da9aed55abf026a07cf00ed3eec7f00 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 13 Dec 2018 06:05:19 -0500
Subject: [PATCH] Small refactoring fixes

---
 .../java/com/topjohnwu/magisk/components/BaseFragment.java  | 6 +-----
 .../src/main/java/com/topjohnwu/core/database/MagiskDB.java | 2 +-
 core/src/main/res/raw/utils.sh                              | 6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/full/java/com/topjohnwu/magisk/components/BaseFragment.java b/app/src/full/java/com/topjohnwu/magisk/components/BaseFragment.java
index 9cd5ae3f7..c4c5313ed 100644
--- a/app/src/full/java/com/topjohnwu/magisk/components/BaseFragment.java
+++ b/app/src/full/java/com/topjohnwu/magisk/components/BaseFragment.java
@@ -10,13 +10,9 @@ import butterknife.Unbinder;
 
 public class BaseFragment extends Fragment implements Topic.AutoSubscriber {
 
-    public App app;
+    public App app = App.self;
     protected Unbinder unbinder = null;
 
-    public BaseFragment() {
-        app = App.self;
-    }
-
     @Override
     public void onResume() {
         super.onResume();
diff --git a/core/src/main/java/com/topjohnwu/core/database/MagiskDB.java b/core/src/main/java/com/topjohnwu/core/database/MagiskDB.java
index 263d01cd9..f14f93ed7 100644
--- a/core/src/main/java/com/topjohnwu/core/database/MagiskDB.java
+++ b/core/src/main/java/com/topjohnwu/core/database/MagiskDB.java
@@ -23,7 +23,7 @@ import java.util.Map;
 public class MagiskDB {
 
     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 STRINGS_TABLE = "strings";
 
diff --git a/core/src/main/res/raw/utils.sh b/core/src/main/res/raw/utils.sh
index 3780dd785..8251208d1 100644
--- a/core/src/main/res/raw/utils.sh
+++ b/core/src/main/res/raw/utils.sh
@@ -63,9 +63,9 @@ restore_imgs() {
 post_ota() {
   cd $1
   chmod 755 bootctl
-  ../../../../../app/src/full/res/raw/bootctl hal-info || return
-  [ `../../../../../app/src/full/res/raw/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 hal-info || return
+  [ `./bootctl get-current-slot` -eq 0 ] && SLOT_NUM=1 || SLOT_NUM=0
+  ./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
   chmod 755 post-fs-data.d/post_ota.sh
   cd /