From 24b16e2ce20202b2507c5ec7a8f025b5a94e9c52 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Thu, 8 Jun 2023 21:15:32 +0300 Subject: [PATCH] Fix debug/release sources packages --- app/build.gradle | 4 ++-- .../kotatsu/{ => core}/util/LoggingAdapterDataObserver.kt | 2 +- .../org/koitharu/kotatsu/{ => core}/util/ext/DebugExt.kt | 2 +- .../kotatsu/bookmarks/domain/BookmarksRepository.kt | 2 +- .../org/koitharu/kotatsu/core/github/AppUpdateRepository.kt | 2 +- .../kotlin/org/koitharu/kotatsu/core/logs/FileLogger.kt | 2 +- .../org/koitharu/kotatsu/core/network/AppProxySelector.kt | 2 +- .../kotatsu/core/network/CommonHeadersInterceptor.kt | 2 +- .../kotlin/org/koitharu/kotatsu/core/network/DoHManager.kt | 2 +- .../kotlin/org/koitharu/kotatsu/core/network/SSLBypass.kt | 2 +- .../kotatsu/core/network/cookies/PreferencesCookieJar.kt | 2 +- .../kotlin/org/koitharu/kotatsu/core/os/ShortcutsUpdater.kt | 2 +- .../kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt | 2 +- .../org/koitharu/kotatsu/core/ui/CoroutineIntentService.kt | 2 +- .../org/koitharu/kotatsu/core/ui/util/ReversibleHandle.kt | 2 +- .../kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt | 2 +- .../kotlin/org/koitharu/kotatsu/core/util/ext/String.kt | 1 - .../kotatsu/details/service/MangaPrefetchService.kt | 2 +- .../download/ui/worker/DownloadNotificationFactory.kt | 2 +- .../koitharu/kotatsu/download/ui/worker/DownloadWorker.kt | 2 +- .../koitharu/kotatsu/explore/domain/ExploreRepository.kt | 2 +- .../org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt | 2 +- .../koitharu/kotatsu/history/domain/HistoryUpdateUseCase.kt | 2 +- .../org/koitharu/kotatsu/local/data/LocalMangaRepository.kt | 2 +- .../kotlin/org/koitharu/kotatsu/local/data/PagesCache.kt | 2 +- .../kotatsu/local/domain/DeleteLocalMangaUseCase.kt | 2 +- .../kotatsu/reader/domain/DetectReaderModeUseCase.kt | 2 +- .../kotlin/org/koitharu/kotatsu/reader/domain/PageLoader.kt | 2 +- .../org/koitharu/kotatsu/reader/ui/ReaderInfoBarView.kt | 2 +- .../org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt | 2 +- .../koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt | 2 +- .../koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt | 1 - .../koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt | 2 +- .../koitharu/kotatsu/scrobbling/anilist/data/ScoreFormat.kt | 2 +- .../koitharu/kotatsu/scrobbling/common/domain/Scrobbler.kt | 2 +- .../common/ui/selector/ScrobblingSelectorViewModel.kt | 2 +- .../kotatsu/search/ui/multi/MultiSearchViewModel.kt | 2 +- .../koitharu/kotatsu/settings/DownloadsSettingsFragment.kt | 2 +- .../koitharu/kotatsu/settings/ServicesSettingsFragment.kt | 2 +- .../org/koitharu/kotatsu/settings/SourceSettingsFragment.kt | 2 +- .../koitharu/kotatsu/settings/UserDataSettingsFragment.kt | 2 +- .../kotatsu/settings/utils/ActivityListPreference.kt | 2 +- .../koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt | 2 +- .../java/org/koitharu/kotatsu/core/util/ext/Debug.kt | 6 ++++++ .../release/java/org/koitharu/kotatsu/utils/ext/DebugExt.kt | 5 ----- 45 files changed, 48 insertions(+), 49 deletions(-) rename app/src/debug/java/org/koitharu/kotatsu/{ => core}/util/LoggingAdapterDataObserver.kt (96%) rename app/src/debug/java/org/koitharu/kotatsu/{ => core}/util/ext/DebugExt.kt (57%) create mode 100644 app/src/release/java/org/koitharu/kotatsu/core/util/ext/Debug.kt delete mode 100644 app/src/release/java/org/koitharu/kotatsu/utils/ext/DebugExt.kt diff --git a/app/build.gradle b/app/build.gradle index 094ef4ff5..e038971dd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId 'org.koitharu.kotatsu' minSdkVersion 21 targetSdkVersion 33 - versionCode 547 - versionName '5.1.3' + versionCode 550 + versionName '5.2-a1' generatedDensities = [] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/debug/java/org/koitharu/kotatsu/util/LoggingAdapterDataObserver.kt b/app/src/debug/java/org/koitharu/kotatsu/core/util/LoggingAdapterDataObserver.kt similarity index 96% rename from app/src/debug/java/org/koitharu/kotatsu/util/LoggingAdapterDataObserver.kt rename to app/src/debug/java/org/koitharu/kotatsu/core/util/LoggingAdapterDataObserver.kt index 07ae3c4bb..2d47a63b3 100644 --- a/app/src/debug/java/org/koitharu/kotatsu/util/LoggingAdapterDataObserver.kt +++ b/app/src/debug/java/org/koitharu/kotatsu/core/util/LoggingAdapterDataObserver.kt @@ -1,4 +1,4 @@ -package org.koitharu.kotatsu.util +package org.koitharu.kotatsu.core.util import android.util.Log import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver diff --git a/app/src/debug/java/org/koitharu/kotatsu/util/ext/DebugExt.kt b/app/src/debug/java/org/koitharu/kotatsu/core/util/ext/DebugExt.kt similarity index 57% rename from app/src/debug/java/org/koitharu/kotatsu/util/ext/DebugExt.kt rename to app/src/debug/java/org/koitharu/kotatsu/core/util/ext/DebugExt.kt index acaab0f0c..62af20cbc 100644 --- a/app/src/debug/java/org/koitharu/kotatsu/util/ext/DebugExt.kt +++ b/app/src/debug/java/org/koitharu/kotatsu/core/util/ext/DebugExt.kt @@ -1,3 +1,3 @@ -package org.koitharu.kotatsu.util.ext +package org.koitharu.kotatsu.core.util.ext fun Throwable.printStackTraceDebug() = printStackTrace() diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt index 598113eb8..fab2180f3 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/BookmarksRepository.kt @@ -15,8 +15,8 @@ import org.koitharu.kotatsu.core.db.entity.toEntity import org.koitharu.kotatsu.core.db.entity.toManga import org.koitharu.kotatsu.core.ui.util.ReversibleHandle import org.koitharu.kotatsu.core.util.ext.mapItems +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import org.koitharu.kotatsu.parsers.model.Manga -import org.koitharu.kotatsu.util.ext.printStackTraceDebug import javax.inject.Inject @Reusable diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt index 03047a807..4d26db92a 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt @@ -16,12 +16,12 @@ import org.koitharu.kotatsu.BuildConfig import org.koitharu.kotatsu.core.network.BaseHttpClient import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.core.util.ext.asArrayList +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import org.koitharu.kotatsu.parsers.util.await import org.koitharu.kotatsu.parsers.util.byte2HexFormatted import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull import org.koitharu.kotatsu.parsers.util.parseJsonArray import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.koitharu.kotatsu.util.ext.printStackTraceDebug import java.io.ByteArrayInputStream import java.io.InputStream import java.security.MessageDigest diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/logs/FileLogger.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/logs/FileLogger.kt index d63c2e3bb..ee75e9e21 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/logs/FileLogger.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/logs/FileLogger.kt @@ -17,7 +17,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.core.util.ext.processLifecycleScope import org.koitharu.kotatsu.core.util.ext.subdir import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.io.File import java.io.FileOutputStream import java.text.SimpleDateFormat diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/AppProxySelector.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/AppProxySelector.kt index 7d67a40fd..87a410ba6 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/AppProxySelector.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/AppProxySelector.kt @@ -1,7 +1,7 @@ package org.koitharu.kotatsu.core.network import org.koitharu.kotatsu.core.prefs.AppSettings -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.io.IOException import java.net.InetSocketAddress import java.net.Proxy diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CommonHeadersInterceptor.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CommonHeadersInterceptor.kt index ce873fbc6..979dcd7f2 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CommonHeadersInterceptor.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CommonHeadersInterceptor.kt @@ -12,7 +12,7 @@ import org.koitharu.kotatsu.core.parser.MangaRepository import org.koitharu.kotatsu.core.parser.RemoteMangaRepository import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.mergeWith -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.net.IDN import java.util.Locale import javax.inject.Inject diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/DoHManager.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/DoHManager.kt index 9547b4da5..0cc4b6db0 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/DoHManager.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/DoHManager.kt @@ -6,7 +6,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.OkHttpClient import okhttp3.dnsoverhttps.DnsOverHttps import org.koitharu.kotatsu.core.prefs.AppSettings -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.net.InetAddress import java.net.UnknownHostException diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/SSLBypass.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/SSLBypass.kt index a7dc8a04a..d5ef6fd59 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/SSLBypass.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/SSLBypass.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.core.network import android.annotation.SuppressLint import okhttp3.OkHttpClient -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.security.SecureRandom import java.security.cert.X509Certificate import javax.net.ssl.SSLContext diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/cookies/PreferencesCookieJar.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/cookies/PreferencesCookieJar.kt index 4a709f38b..623824e57 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/cookies/PreferencesCookieJar.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/cookies/PreferencesCookieJar.kt @@ -8,7 +8,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import okhttp3.Cookie import okhttp3.HttpUrl -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug private const val PREFS_NAME = "cookies" diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/os/ShortcutsUpdater.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/os/ShortcutsUpdater.kt index 4481c4038..8803fa2d7 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/os/ShortcutsUpdater.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/os/ShortcutsUpdater.kt @@ -31,7 +31,7 @@ import org.koitharu.kotatsu.history.data.HistoryRepository import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.util.runCatchingCancellable import org.koitharu.kotatsu.reader.ui.ReaderActivity -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt index 74948fcdb..cdf31661b 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt @@ -17,7 +17,7 @@ import kotlinx.coroutines.launch import org.koitharu.kotatsu.core.util.ext.EventFlow import org.koitharu.kotatsu.core.util.ext.MutableEventFlow import org.koitharu.kotatsu.core.util.ext.call -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/CoroutineIntentService.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/CoroutineIntentService.kt index dc1c59bd4..2d4ead31d 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/CoroutineIntentService.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/CoroutineIntentService.kt @@ -9,7 +9,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug abstract class CoroutineIntentService : BaseService() { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/ReversibleHandle.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/ReversibleHandle.kt index d3d6bc475..6095da3c1 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/ReversibleHandle.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/ReversibleHandle.kt @@ -6,7 +6,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.koitharu.kotatsu.core.util.ext.processLifecycleScope import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug fun interface ReversibleHandle { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt index 393a2095b..6d8745f84 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt @@ -43,7 +43,7 @@ import org.jsoup.internal.StringUtil.StringJoiner import org.koitharu.kotatsu.BuildConfig import org.koitharu.kotatsu.R import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import org.xmlpull.v1.XmlPullParser import org.xmlpull.v1.XmlPullParserException import kotlin.math.roundToLong diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/String.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/String.kt index bc09b90f3..b0124dd74 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/String.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/String.kt @@ -2,7 +2,6 @@ package org.koitharu.kotatsu.core.util.ext import androidx.annotation.FloatRange import org.koitharu.kotatsu.parsers.util.levenshteinDistance -import org.koitharu.kotatsu.util.ext.printStackTraceDebug import java.util.UUID inline fun C?.ifNullOrEmpty(defaultValue: () -> C): C { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/service/MangaPrefetchService.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/service/MangaPrefetchService.kt index ad889e3ce..6c483d475 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/details/service/MangaPrefetchService.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/service/MangaPrefetchService.kt @@ -15,7 +15,7 @@ import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadNotificationFactory.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadNotificationFactory.kt index d7985849c..41568e832 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadNotificationFactory.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadNotificationFactory.kt @@ -32,7 +32,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.format import org.koitharu.kotatsu.parsers.util.runCatchingCancellable import org.koitharu.kotatsu.search.ui.MangaListActivity -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.util.UUID import com.google.android.material.R as materialR diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt index 0d620188d..d1c18925a 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt @@ -60,7 +60,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.await import org.koitharu.kotatsu.parsers.util.mapToSet import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.io.File import java.util.UUID import java.util.concurrent.TimeUnit diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt index de68c4097..c91336c1c 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/explore/domain/ExploreRepository.kt @@ -9,7 +9,7 @@ import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.runCatchingCancellable import org.koitharu.kotatsu.suggestions.domain.TagsBlacklist -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import javax.inject.Inject class ExploreRepository @Inject constructor( diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt index f4442dbd8..bff70420b 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt @@ -35,7 +35,7 @@ import org.koitharu.kotatsu.parsers.util.SuspendLazy import org.koitharu.kotatsu.parsers.util.runCatchingCancellable import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment import org.koitharu.kotatsu.search.domain.MangaSearchRepository -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.text.Collator import java.util.LinkedList import java.util.Locale diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/history/domain/HistoryUpdateUseCase.kt b/app/src/main/kotlin/org/koitharu/kotatsu/history/domain/HistoryUpdateUseCase.kt index a28d27fb8..452d0368f 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/history/domain/HistoryUpdateUseCase.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/history/domain/HistoryUpdateUseCase.kt @@ -7,7 +7,7 @@ import org.koitharu.kotatsu.history.data.HistoryRepository import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.util.runCatchingCancellable import org.koitharu.kotatsu.reader.ui.ReaderState -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import javax.inject.Inject class HistoryUpdateUseCase @Inject constructor( diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalMangaRepository.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalMangaRepository.kt index 1bd6dceb8..9405629cf 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalMangaRepository.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalMangaRepository.kt @@ -27,7 +27,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.model.MangaTag import org.koitharu.kotatsu.parsers.model.SortOrder import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.io.File import java.util.EnumSet import javax.inject.Inject diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/PagesCache.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/PagesCache.kt index 0e53a89e8..ad52d2d26 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/PagesCache.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/PagesCache.kt @@ -18,7 +18,7 @@ import org.koitharu.kotatsu.core.util.ext.takeIfWriteable import org.koitharu.kotatsu.core.util.ext.writeAllCancellable import org.koitharu.kotatsu.parsers.util.SuspendLazy import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.io.File import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/domain/DeleteLocalMangaUseCase.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/domain/DeleteLocalMangaUseCase.kt index ef613604f..07a22f924 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/local/domain/DeleteLocalMangaUseCase.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/domain/DeleteLocalMangaUseCase.kt @@ -5,7 +5,7 @@ import org.koitharu.kotatsu.history.data.HistoryRepository import org.koitharu.kotatsu.local.data.LocalMangaRepository import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.io.IOException import javax.inject.Inject diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/DetectReaderModeUseCase.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/DetectReaderModeUseCase.kt index 08a3e345b..049914d3c 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/DetectReaderModeUseCase.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/DetectReaderModeUseCase.kt @@ -17,7 +17,7 @@ import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaPage import org.koitharu.kotatsu.parsers.util.runCatchingCancellable import org.koitharu.kotatsu.reader.ui.ReaderState -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.io.InputStream import java.util.zip.ZipFile import javax.inject.Inject diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/PageLoader.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/PageLoader.kt index eeac2ce29..48e5faf0e 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/PageLoader.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/PageLoader.kt @@ -42,7 +42,7 @@ import org.koitharu.kotatsu.local.data.PagesCache import org.koitharu.kotatsu.parsers.model.MangaPage import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.reader.ui.pager.ReaderPage -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.io.File import java.util.LinkedList import java.util.concurrent.atomic.AtomicInteger diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderInfoBarView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderInfoBarView.kt index 7c2eb733a..e0306c6fb 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderInfoBarView.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderInfoBarView.kt @@ -22,7 +22,7 @@ import org.koitharu.kotatsu.core.util.ext.measureDimension import org.koitharu.kotatsu.core.util.ext.resolveDp import org.koitharu.kotatsu.parsers.util.format import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.text.SimpleDateFormat import java.util.Date import com.google.android.material.R as materialR diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt index 17b52edd0..d95be359b 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt @@ -56,7 +56,7 @@ import org.koitharu.kotatsu.reader.domain.DetectReaderModeUseCase import org.koitharu.kotatsu.reader.domain.PageLoader import org.koitharu.kotatsu.reader.ui.config.ReaderSettings import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.util.Date import javax.inject.Inject diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt index 21a0f4f41..617e79839 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt @@ -21,7 +21,7 @@ import org.koitharu.kotatsu.core.os.NetworkState import org.koitharu.kotatsu.parsers.model.MangaPage import org.koitharu.kotatsu.reader.domain.PageLoader import org.koitharu.kotatsu.reader.ui.config.ReaderSettings -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.io.File import java.io.IOException diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt index eb5927fb1..2cacd4eea 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt @@ -20,7 +20,6 @@ import org.koitharu.kotatsu.reader.domain.PageLoader import org.koitharu.kotatsu.reader.ui.config.ReaderSettings import org.koitharu.kotatsu.reader.ui.pager.BasePageHolder import org.koitharu.kotatsu.reader.ui.pager.ReaderPage -import org.koitharu.kotatsu.util.ext.* open class PageHolder( owner: LifecycleOwner, diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt index 816c464f7..b89e4788c 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt @@ -36,7 +36,7 @@ import org.koitharu.kotatsu.list.ui.model.toUi import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.model.MangaTag -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import javax.inject.Inject private const val FILTER_MIN_INTERVAL = 250L diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/anilist/data/ScoreFormat.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/anilist/data/ScoreFormat.kt index 1d4e04c41..47b7bcadf 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/anilist/data/ScoreFormat.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/anilist/data/ScoreFormat.kt @@ -1,6 +1,6 @@ package org.koitharu.kotatsu.scrobbling.anilist.data -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug enum class ScoreFormat { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/Scrobbler.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/Scrobbler.kt index 44251693e..52cb7a107 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/Scrobbler.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/Scrobbler.kt @@ -21,7 +21,7 @@ import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerService import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerUser import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingStatus -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.util.EnumMap abstract class Scrobbler( diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt index f322f53c4..b965cdf9c 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt @@ -27,7 +27,7 @@ import org.koitharu.kotatsu.parsers.util.runCatchingCancellable import org.koitharu.kotatsu.scrobbling.common.domain.Scrobbler import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerManga import org.koitharu.kotatsu.scrobbling.common.ui.selector.model.ScrobblerHint -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt index 2f4615796..06d28f85a 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt @@ -33,7 +33,7 @@ import org.koitharu.kotatsu.list.ui.model.LoadingState import org.koitharu.kotatsu.list.ui.model.toUi import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.util.runCatchingCancellable -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import javax.inject.Inject private const val MAX_PARALLELISM = 4 diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/DownloadsSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/DownloadsSettingsFragment.kt index 151de74e5..0bcd68106 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/DownloadsSettingsFragment.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/DownloadsSettingsFragment.kt @@ -16,7 +16,7 @@ import org.koitharu.kotatsu.core.util.ext.getStorageName import org.koitharu.kotatsu.core.util.ext.viewLifecycleScope import org.koitharu.kotatsu.download.ui.worker.DownloadWorker import org.koitharu.kotatsu.local.data.LocalStorageManager -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.io.File import javax.inject.Inject diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/ServicesSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/ServicesSettingsFragment.kt index 7e1409c9d..74e04a2a2 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/ServicesSettingsFragment.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/ServicesSettingsFragment.kt @@ -25,7 +25,7 @@ import org.koitharu.kotatsu.scrobbling.mal.data.MALRepository import org.koitharu.kotatsu.scrobbling.shikimori.data.ShikimoriRepository import org.koitharu.kotatsu.sync.domain.SyncController import org.koitharu.kotatsu.sync.ui.SyncSettingsIntent -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt index 565b8395d..81a2c47b6 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt @@ -25,7 +25,7 @@ import org.koitharu.kotatsu.parsers.exception.AuthRequiredException import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.util.runCatchingCancellable import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsFragment.kt index c21c4571d..c680ab2af 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsFragment.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/UserDataSettingsFragment.kt @@ -31,7 +31,7 @@ import org.koitharu.kotatsu.search.domain.MangaSearchRepository import org.koitharu.kotatsu.settings.backup.BackupDialogFragment import org.koitharu.kotatsu.settings.backup.RestoreDialogFragment import org.koitharu.kotatsu.tracker.domain.TrackingRepository -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/ActivityListPreference.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/ActivityListPreference.kt index 950c69c2c..43e38d720 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/ActivityListPreference.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/utils/ActivityListPreference.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.util.AttributeSet import androidx.preference.ListPreference -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug class ActivityListPreference : ListPreference { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt b/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt index d58db1e4c..8d203ac8e 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt @@ -57,7 +57,7 @@ import org.koitharu.kotatsu.reader.ui.ReaderActivity import org.koitharu.kotatsu.suggestions.domain.MangaSuggestion import org.koitharu.kotatsu.suggestions.domain.SuggestionRepository import org.koitharu.kotatsu.suggestions.domain.TagsBlacklist -import org.koitharu.kotatsu.util.ext.printStackTraceDebug +import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import java.util.concurrent.TimeUnit import kotlin.math.pow import kotlin.random.Random diff --git a/app/src/release/java/org/koitharu/kotatsu/core/util/ext/Debug.kt b/app/src/release/java/org/koitharu/kotatsu/core/util/ext/Debug.kt new file mode 100644 index 000000000..01d0a3f41 --- /dev/null +++ b/app/src/release/java/org/koitharu/kotatsu/core/util/ext/Debug.kt @@ -0,0 +1,6 @@ +@file:Suppress("UnusedReceiverParameter") + +package org.koitharu.kotatsu.core.util.ext + +@Suppress("NOTHING_TO_INLINE") +inline fun Throwable.printStackTraceDebug() = Unit diff --git a/app/src/release/java/org/koitharu/kotatsu/utils/ext/DebugExt.kt b/app/src/release/java/org/koitharu/kotatsu/utils/ext/DebugExt.kt deleted file mode 100644 index c44e50454..000000000 --- a/app/src/release/java/org/koitharu/kotatsu/utils/ext/DebugExt.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.koitharu.kotatsu.utils.ext - -import org.koitharu.kotatsu.BuildConfig - -inline fun Throwable.printStackTraceDebug() = Unit \ No newline at end of file