Skip to content

Commit 7fdbac1

Browse files
replace debug log checks
Signed-off-by: androidacy-user <opensource@androidacy.com>
1 parent df0aa1f commit 7fdbac1

5 files changed

Lines changed: 16 additions & 21 deletions

File tree

app/src/main/kotlin/com/fox2code/mmm/MainActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,6 @@ class MainActivity : AppCompatActivity(), OnRefreshListener, OverScrollHelper {
620620

621621
fun commonNext() {
622622
if (BuildConfig.DEBUG) {
623-
if (MainApplication.forceDebugLogging) Timber.d("Common next")
624623
moduleViewListBuilder.addNotification(NotificationType.DEBUG)
625624
}
626625
NotificationType.NO_INTERNET.autoAdd(moduleViewListBuilderOnline)

app/src/main/kotlin/com/fox2code/mmm/installer/InstallerInitializer.kt

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
package com.fox2code.mmm.installer
66

7-
import com.fox2code.mmm.BuildConfig
87
import com.fox2code.mmm.Constants
98
import com.fox2code.mmm.MainApplication
109
import com.fox2code.mmm.NotificationType
@@ -134,8 +133,8 @@ class InstallerInitializer {
134133
"su -V",
135134
).to(output).exec().isSuccess
136135
) {
137-
if (BuildConfig.DEBUG) {
138-
if (MainApplication.forceDebugLogging) Timber.i("Failed to search for ramdisk")
136+
if (MainApplication.forceDebugLogging) {
137+
Timber.i("Failed to search for ramdisk")
139138
}
140139
if (output.size != 0) {
141140
hsRmdsk = "false" == output[0] || "true".equals(
@@ -145,8 +144,8 @@ class InstallerInitializer {
145144
Companion.hsRmdsk = hsRmdsk
146145
return null
147146
}
148-
if (BuildConfig.DEBUG) {
149-
if (MainApplication.forceDebugLogging) Timber.i("Found ramdisk: %s", output[0])
147+
if (MainApplication.forceDebugLogging) {
148+
Timber.i("Found ramdisk: %s", output[0])
150149
if (MainApplication.forceDebugLogging) Timber.i("Searching for Magisk path. Current path: %s", mgskPth)
151150
}
152151
// reset output
@@ -156,8 +155,8 @@ class InstallerInitializer {
156155
"not found"
157156
)) {
158157
mgskPth = output[0]
159-
if (BuildConfig.DEBUG) {
160-
if (MainApplication.forceDebugLogging) Timber.i("Magisk path 1: %s", mgskPth)
158+
if (MainApplication.forceDebugLogging) {
159+
Timber.i("Magisk path 1: %s", mgskPth)
161160
}
162161
} else if (Shell.cmd("if [ -d /data/adb/ksu ]; then echo true; else echo false; fi", "su -V").to(
163162
output
@@ -167,8 +166,8 @@ class InstallerInitializer {
167166
val suVer: ArrayList<String> = ArrayList()
168167
Shell.cmd("su -v").to(suVer).exec()
169168
if (suVer.size > 0 && suVer[0].contains("ksu") || suVer[0].contains("Kernelsu", true)) {
170-
if (BuildConfig.DEBUG) {
171-
if (MainApplication.forceDebugLogging) Timber.i("Kernelsu detected")
169+
if (MainApplication.forceDebugLogging) {
170+
Timber.i("Kernelsu detected")
172171
}
173172
mgskPth = "/data/adb"
174173
isKsu = true
@@ -177,14 +176,12 @@ class InstallerInitializer {
177176
Countly.sharedInstance().crashes().addCrashBreadcrumb("ksu detected")
178177
}
179178
} else {
180-
if (BuildConfig.DEBUG) {
181-
Timber.e("[ANOMALY] Kernelsu not detected but /data/adb/ksu exists")
179+
if (MainApplication.forceDebugLogging) { Timber.e("[ANOMALY] Kernelsu not detected but /data/adb/ksu exists")
182180
}
183181
return null
184182
}
185183
} else {
186-
if (BuildConfig.DEBUG) {
187-
Timber.e("Failed to get Magisk path")
184+
if (MainApplication.forceDebugLogging) { Timber.e("Failed to get Magisk path")
188185
}
189186
return null
190187
}

app/src/main/kotlin/com/fox2code/mmm/module/ModuleViewListBuilder.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import android.os.Looper
1111
import android.view.View
1212
import androidx.recyclerview.widget.RecyclerView
1313
import com.fox2code.mmm.AppUpdateManager
14-
import com.fox2code.mmm.BuildConfig
1514
import com.fox2code.mmm.MainActivity
1615
import com.fox2code.mmm.MainApplication
1716
import com.fox2code.mmm.NotificationType
@@ -73,8 +72,8 @@ class ModuleViewListBuilder(private val activity: Activity) {
7372
}
7473

7574
fun appendRemoteModules() {
76-
if (BuildConfig.DEBUG) {
77-
if (MainApplication.forceDebugLogging) Timber.i("appendRemoteModules() called")
75+
if (MainApplication.forceDebugLogging) {
76+
Timber.i("appendRemoteModules() called")
7877
}
7978
synchronized(updateLock) {
8079
if (MainApplication.forceDebugLogging) Timber.i("appendRemoteModules() started")

app/src/main/kotlin/com/fox2code/mmm/utils/RuntimeUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ class RuntimeUtils {
166166
// Restarting setup
167167
firstLaunch = false
168168
}
169-
if (BuildConfig.DEBUG) {
170-
if (MainApplication.forceDebugLogging) Timber.i(
169+
if (MainApplication.forceDebugLogging) {
170+
Timber.i(
171171
"First launch: %s, pref value: %s",
172172
firstLaunch,
173173
prefs.getString("last_shown_setup", null)

app/src/main/kotlin/com/fox2code/mmm/utils/ZipFileOpener.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ class ZipFileOpener : AppCompatActivity() {
120120
zip = ZipFile(zipFile)
121121
if (zip.getEntry("module.prop").also { entry = it } == null) {
122122
Timber.e("onCreate: Zip file is not a valid magisk module")
123-
if (BuildConfig.DEBUG) {
124-
if (MainApplication.forceDebugLogging) Timber.d(
123+
if (MainApplication.forceDebugLogging) {
124+
Timber.d(
125125
"onCreate: Zip file contents: %s",
126126
zip.stream().map { obj: ZipEntry -> obj.name }
127127
.reduce { a: String, b: String -> "$a, $b" }.orElse("empty")

0 commit comments

Comments
 (0)