diff --git a/app/src/main/java/com/futo/platformplayer/Settings.kt b/app/src/main/java/com/futo/platformplayer/Settings.kt index d5adb409..565fbdde 100644 --- a/app/src/main/java/com/futo/platformplayer/Settings.kt +++ b/app/src/main/java/com/futo/platformplayer/Settings.kt @@ -549,6 +549,8 @@ class Settings : FragmentedStorageFileJson() { @DropdownFieldOptionsId(R.array.log_levels) var logLevel: Int = 0; + fun isVerbose() = logLevel >= 4; + @FormField(R.string.submit_logs, FieldForm.BUTTON, R.string.submit_logs_to_help_us_narrow_down_issues, 1) fun submitLogs() { StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) { diff --git a/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt index 9c921982..bc26f3dd 100644 --- a/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt +++ b/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt @@ -192,6 +192,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher { } override fun onCreate(savedInstanceState: Bundle?) { + Logger.i(TAG, "MainActivity Starting"); StateApp.instance.setGlobalContext(this, lifecycleScope); StateApp.instance.mainAppStarting(this); diff --git a/app/src/main/java/com/futo/platformplayer/logging/FileLogConsumer.kt b/app/src/main/java/com/futo/platformplayer/logging/FileLogConsumer.kt index ef773462..20a3544e 100644 --- a/app/src/main/java/com/futo/platformplayer/logging/FileLogConsumer.kt +++ b/app/src/main/java/com/futo/platformplayer/logging/FileLogConsumer.kt @@ -43,7 +43,8 @@ class FileLogConsumer : ILogConsumer, Closeable { } while (_linesToWrite.isNotEmpty()) { - _writer?.appendLine(_linesToWrite.remove()); + val todo = _linesToWrite.remove() + _writer?.appendLine(todo); } _writer?.flush(); @@ -85,7 +86,7 @@ class FileLogConsumer : ILogConsumer, Closeable { _running = false; _writer?.close(); _writer = null; - _logThread?.join(); + //_logThread?.join(); _logThread = null; } diff --git a/app/src/main/java/com/futo/platformplayer/states/StateApp.kt b/app/src/main/java/com/futo/platformplayer/states/StateApp.kt index 3df39baa..1142310c 100644 --- a/app/src/main/java/com/futo/platformplayer/states/StateApp.kt +++ b/app/src/main/java/com/futo/platformplayer/states/StateApp.kt @@ -333,7 +333,7 @@ class StateApp { suspend fun backgroundStarting(context: Context, scope: CoroutineScope, withFiles: Boolean, withPlugins: Boolean) { if(contextOrNull == null) { Logger.i(TAG, "BACKGROUND STATE: Starting"); - if(!Logger.hasConsumers && BuildConfig.DEBUG) { + if(!Logger.hasConsumers && (BuildConfig.DEBUG)) { Logger.i(TAG, "BACKGROUND STATE: Initialize logger"); Logger.setLogConsumers(listOf(AndroidLogConsumer())); } diff --git a/app/src/main/java/com/futo/platformplayer/states/StatePlayer.kt b/app/src/main/java/com/futo/platformplayer/states/StatePlayer.kt index 0ecb4cb8..9226292d 100644 --- a/app/src/main/java/com/futo/platformplayer/states/StatePlayer.kt +++ b/app/src/main/java/com/futo/platformplayer/states/StatePlayer.kt @@ -14,6 +14,7 @@ import com.futo.platformplayer.api.media.models.video.IPlatformVideo import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails import com.futo.platformplayer.constructs.Event0 import com.futo.platformplayer.constructs.Event1 +import com.futo.platformplayer.logging.Logger import com.futo.platformplayer.models.Playlist import com.futo.platformplayer.services.MediaPlaybackService import com.futo.platformplayer.video.PlayerManager @@ -633,6 +634,7 @@ class StatePlayer { val instance = _instance; _instance = null; instance?.dispose(); + Logger.i(TAG, "Disposed StatePlayer"); } } } \ No newline at end of file