Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update v2.0.6 #160

Merged
merged 2 commits into from
Nov 27, 2024
Merged

Update v2.0.6 #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4699076
[fix]: content contains field in filters and battery consumption
F0x1d Nov 24, 2024
13780c8
[build]: bumped app version
F0x1d Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
defaultConfig {
applicationId = logFoxPackageName

versionCode = 65
versionName = "2.0.5"
versionCode = 66
versionName = "2.0.6"
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...c/main/kotlin/com/f0x1d/logfox/feature/filters/edit/presentation/ui/EditFilterFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class EditFilterFragment : BaseFragment<FragmentEditFilterBinding>() {
tidText.doAfterTextChanged { viewModel.tid = it?.toString().orEmpty() }
packageNameText.doAfterTextChanged { viewModel.packageName = it?.toString().orEmpty() }
tagText.doAfterTextChanged { viewModel.tag = it?.toString().orEmpty() }
contentText.doAfterTextChanged { viewModel.tag = it?.toString().orEmpty() }
contentText.doAfterTextChanged { viewModel.content = it?.toString().orEmpty() }

viewModel.state.collectWithLifecycle { state ->
updateIncludingButton(state.including)
Expand Down
6 changes: 3 additions & 3 deletions .../impl/src/main/kotlin/com/f0x1d/logfox/feature/logging/impl/data/LoggingRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import com.f0x1d.logfox.preferences.shared.AppPreferences
import com.f0x1d.logfox.terminals.base.Terminal
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.FlowCollector
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.withContext
import kotlinx.coroutines.withTimeout
import kotlinx.coroutines.yield
import timber.log.Timber
import java.io.BufferedReader
import javax.inject.Inject
Expand Down Expand Up @@ -110,11 +110,11 @@ internal class LoggingRepositoryImpl @Inject constructor(

private suspend fun BufferedReader.readLineCancellable(): String = withContext(ioDispatcher) {
while (true) {
yield()

if (ready()) {
return@withContext readLine()
}

delay(100L)
}

"not reachable"
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/kotlin/com/f0x1d/logfox/feature/logging/service/presentation/LoggingService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class LoggingService : LifecycleService() {
terminal = loggingTerminal,
startingId = logs.lastOrNull()?.id ?: 0,
).catch { throwable ->
Timber.e(throwable)
Timber.e("logging flow threw smth", throwable)

if (throwable is TerminalNotSupportedException) {
if (appPreferences.fallbackToDefaultTerminal) {
Expand Down
Loading