Skip to content

Commit 4e11467

Browse files
committed
Fix critical bug with the logger crashing the app
1 parent 3266b74 commit 4e11467

6 files changed

Lines changed: 42 additions & 15 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ patch-level version changes can be found in [commit messages](../../commits/mast
77
## Next_Ver
88
-->
99

10+
## 20250217
11+
12+
- Fix critical bug with the logger crashing the app
13+
1014
## 20250209
1115

1216
- Update dependency versions

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ android {
4848
applicationId = "com.fredhappyface.ewesticker"
4949
minSdk = 26
5050
targetSdk = 35
51-
versionCode = 20250209
52-
versionName = "20250209"
51+
versionCode = 20250217
52+
versionName = "20250217"
5353
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
5454
setProperty("archivesBaseName", "$applicationId-$versionName")
5555
}

app/src/main/java/com/fredhappyface/ewesticker/ImageKeyboard.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import com.fredhappyface.ewesticker.utilities.Cache
3535
import com.fredhappyface.ewesticker.utilities.StickerClickListener
3636
import com.fredhappyface.ewesticker.utilities.StickerSender
3737
import com.fredhappyface.ewesticker.utilities.Toaster
38+
import com.fredhappyface.ewesticker.utilities.startLogger
3839
import java.io.File
3940
import kotlin.math.abs
4041
import kotlin.math.min
@@ -96,6 +97,7 @@ class ImageKeyboard : InputMethodService(), StickerClickListener {
9697
override fun onCreate() {
9798
// Misc
9899
super.onCreate()
100+
startLogger(filesDir)
99101

100102
XLog.i("=".repeat(80))
101103
XLog.i("Loaded $packageName:${javaClass.name}")

app/src/main/java/com/fredhappyface/ewesticker/MainActivity.kt

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@ import androidx.activity.result.contract.ActivityResultContracts
1717
import androidx.appcompat.app.AppCompatActivity
1818
import androidx.lifecycle.lifecycleScope
1919
import androidx.preference.PreferenceManager
20-
import com.elvishew.xlog.LogConfiguration
21-
import com.elvishew.xlog.LogLevel
2220
import com.elvishew.xlog.XLog
23-
import com.elvishew.xlog.printer.AndroidPrinter
24-
import com.elvishew.xlog.printer.file.FilePrinter
25-
import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator
2621
import com.fredhappyface.ewesticker.utilities.StickerImporter
2722
import com.fredhappyface.ewesticker.utilities.Toaster
23+
import com.fredhappyface.ewesticker.utilities.startLogger
2824
import com.google.android.material.progressindicator.LinearProgressIndicator
2925
import io.noties.markwon.Markwon
3026
import kotlinx.coroutines.Dispatchers
@@ -54,14 +50,7 @@ class MainActivity : AppCompatActivity() {
5450
super.onCreate(savedInstanceState)
5551
setContentView(R.layout.activity_main)
5652

57-
val logConfig = LogConfiguration.Builder().logLevel(LogLevel.ALL).tag("EweSticker").build()
58-
val androidPrinter =
59-
AndroidPrinter(true) // Printer that print the log using android.util.Log
60-
val filePrinter = FilePrinter.Builder(
61-
File(filesDir, "logs").path
62-
).fileNameGenerator(DateFileNameGenerator()).build()
63-
64-
XLog.init(logConfig, androidPrinter, filePrinter)
53+
startLogger(filesDir)
6554

6655
XLog.i("=".repeat(80))
6756
XLog.i("Loaded $packageName:$localClassName")
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.fredhappyface.ewesticker.utilities
2+
3+
import com.elvishew.xlog.LogConfiguration
4+
import com.elvishew.xlog.LogLevel
5+
import com.elvishew.xlog.printer.AndroidPrinter
6+
import com.elvishew.xlog.printer.file.FilePrinter
7+
import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator
8+
import java.io.File
9+
import com.elvishew.xlog.XLog
10+
11+
12+
fun startLogger(filesDir: File) {
13+
14+
try {
15+
XLog.i("startLogger if not already started")
16+
} catch (e: IllegalStateException) {
17+
18+
val logConfig = LogConfiguration.Builder().logLevel(LogLevel.ALL).tag("EweSticker").build()
19+
val androidPrinter =
20+
AndroidPrinter(true) // Printer that print the log using android.util.Log
21+
val filePrinter = FilePrinter.Builder(
22+
File(filesDir, "logs").path
23+
).fileNameGenerator(DateFileNameGenerator()).build()
24+
25+
XLog.init(logConfig, androidPrinter, filePrinter)
26+
}
27+
28+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<h2 id="section">20250217</h2>
2+
<ul>
3+
<li>Fix critical bug with the logger crashing the app</li>
4+
</ul>

0 commit comments

Comments
 (0)