From bc98a335b6deaa37a53c2b484cdde64da21f0abd Mon Sep 17 00:00:00 2001 From: Shashank Date: Sat, 20 May 2023 19:44:28 +0530 Subject: [PATCH] fixes codefactor issues --- .../java/org/kiwix/kiwixmobile/NetworkTest.kt | 1 + .../kiwixmobile/intro/CustomPageIndicator.kt | 3 +- .../kiwixmobile/webserver/ZimHostPresenter.kt | 3 +- .../src/main/kotlin/plugin/AppConfigurer.kt | 2 +- contrib/move-string-resource.kts | 2 +- .../core/downloader/model/Seconds.kt | 5 ++- .../core/main/CoreReaderFragment.kt | 3 +- .../core/main/OnSwipeTouchListener.kt | 3 -- .../page/history/viewmodel/HistoryState.kt | 2 +- .../search/viewmodel/SearchResultGenerator.kt | 9 +++- .../kiwixmobile/core/zim_manager/KiloByte.kt | 10 ++--- .../adapter/BookOnDiskDelegate.kt | 2 +- .../adapter/BooksOnDiskViewHolder.kt | 2 +- .../core/utils/NetworkUtilsTest.kt | 44 +++++++++---------- 14 files changed, 47 insertions(+), 44 deletions(-) diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.kt index ac71f58be..cb0f759e1 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/NetworkTest.kt @@ -109,6 +109,7 @@ class NetworkTest { try { Espresso.onView(ViewMatchers.withId(android.R.id.button1)).perform(ViewActions.click()) } catch (e: RuntimeException) { + e.printStackTrace() } clickOn(R.string.local_zims) try { diff --git a/app/src/main/java/org/kiwix/kiwixmobile/intro/CustomPageIndicator.kt b/app/src/main/java/org/kiwix/kiwixmobile/intro/CustomPageIndicator.kt index f178e70bc..cc5b7baf0 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/intro/CustomPageIndicator.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/intro/CustomPageIndicator.kt @@ -276,8 +276,7 @@ class CustomPageIndicator @JvmOverloads constructor( dotRevealFraction: Float ): Path { unselectedDotPath.rewind() - if ((joiningFraction == selectedFactor || joiningFraction == INVALID_FRACTION) - ) { + if (joiningFraction == selectedFactor || joiningFraction == INVALID_FRACTION) { if (dotRevealFraction == selectedFactor && !(page == currentPage && selectedDotInPosition)) { // case #1 – At rest unselectedDotPath.addCircle(dotCenterX!![page], dotCenterY, dotRadius, Path.Direction.CW) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostPresenter.kt b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostPresenter.kt index 47bfb5e49..1b4fd90d5 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostPresenter.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostPresenter.kt @@ -39,9 +39,8 @@ class ZimHostPresenter @Inject internal constructor(private val dataSource: Data books .filterIsInstance() .forEach { - it.isSelected = ( + it.isSelected = previouslyHostedBooks.contains(it.book.title) || previouslyHostedBooks.isEmpty() - ) } books }.subscribe(object : SingleObserver> { diff --git a/buildSrc/src/main/kotlin/plugin/AppConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AppConfigurer.kt index 46bd09ab4..329c6ac21 100644 --- a/buildSrc/src/main/kotlin/plugin/AppConfigurer.kt +++ b/buildSrc/src/main/kotlin/plugin/AppConfigurer.kt @@ -75,7 +75,7 @@ class AppConfigurer { applicationVariants.all { outputs.filterIsInstance().forEach { output: ApkVariantOutput -> val abiVersionCode = abiCodes[output.getFilter(VariantOutput.FilterType.ABI)] ?: 7 - output.versionCodeOverride = (abiVersionCode * 1_000_000) + output.versionCode + output.versionCodeOverride = abiVersionCode * 1_000_000 + output.versionCode if (output.outputFileName.contains("universal-nightly")) { // this is for issue https://github.com/kiwix/kiwix-android/issues/3103 output.outputFileName = setNameForNightlyUniversalApk() diff --git a/contrib/move-string-resource.kts b/contrib/move-string-resource.kts index 9abb6dfc5..429501b8c 100644 --- a/contrib/move-string-resource.kts +++ b/contrib/move-string-resource.kts @@ -36,7 +36,7 @@ * https://github.com/holgerbrandl/kscript * https://github.com/holgerbrandl/kscript#deploy-scripts-as-standalone-binaries */ - + import java.io.File import java.lang.StringBuilder import kotlin.system.exitProcess diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/model/Seconds.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/model/Seconds.kt index 90687da93..f8b93cd59 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/model/Seconds.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/downloader/model/Seconds.kt @@ -36,16 +36,19 @@ inline class Seconds(val seconds: Long) { context.getString(R.string.time_day), context.getString(R.string.time_left) ) + (seconds / hours).roundToLong() > 0 -> String.format( Locale.getDefault(), "%d %s %s", (seconds / hours).roundToLong(), context.getString(R.string.time_hour), context.getString(R.string.time_left) ) - ((seconds / minutes).roundToLong() > 0) -> String.format( + + (seconds / minutes).roundToLong() > 0 -> String.format( Locale.getDefault(), "%d %s %s", (seconds / minutes).roundToLong(), context.getString(R.string.time_minute), context.getString(R.string.time_left) ) + else -> String.format( Locale.getDefault(), "%d %s %s", seconds, context.getString(R.string.time_second), diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt index bcde9a4bf..1a03dcb24 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt @@ -500,10 +500,9 @@ abstract class CoreReaderFragment : private fun handleIntentExtras(intent: Intent) { if (intent.hasExtra(TAG_FILE_SEARCHED)) { - val openInNewTab = ( + val openInNewTab = isInTabSwitcher || intent.getBooleanExtra(TAG_FILE_SEARCHED_NEW_TAB, false) - ) searchForTitle( intent.getStringExtra(TAG_FILE_SEARCHED), openInNewTab diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/OnSwipeTouchListener.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/OnSwipeTouchListener.kt index e5a64eb61..3c975fb73 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/OnSwipeTouchListener.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/OnSwipeTouchListener.kt @@ -72,8 +72,6 @@ open class OnSwipeTouchListener constructor(context: Context) : OnTouchListener } else if (abs(diffY) > swipeThreshold && abs(velocityY) > swipeVelocityThreshold) { if (diffY > 0) { onSwipeBottom() - } else { - onSwipeTop() } return true } @@ -86,7 +84,6 @@ open class OnSwipeTouchListener constructor(context: Context) : OnTouchListener open fun onSwipeRight() {} open fun onSwipeLeft() {} - fun onSwipeTop() {} open fun onSwipeBottom() {} open fun onTap(e: MotionEvent?) {} } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/HistoryState.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/HistoryState.kt index fb45b7041..10ea0b37a 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/HistoryState.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/HistoryState.kt @@ -38,5 +38,5 @@ data class HistoryState( ) override fun copyWithNewItems(newItems: List): PageState = - copy(pageItems = (newItems)) + copy(pageItems = newItems) } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchResultGenerator.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchResultGenerator.kt index 01cbff15d..6969eebf0 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchResultGenerator.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchResultGenerator.kt @@ -60,7 +60,14 @@ class ZimSearchResultGenerator @Inject constructor() : SearchResultGenerator { private suspend fun createList(readSearchResult: suspend () -> T?): List { return mutableListOf().apply { - while (true) readSearchResult()?.let(::add) ?: break + while (true) { + val result = readSearchResult() + if (result != null) { + add(result) + } else { + break + } + } } } } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/KiloByte.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/KiloByte.kt index 801140a34..2968beb8b 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/KiloByte.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/KiloByte.kt @@ -27,11 +27,9 @@ inline class KiloByte(private val kilobyteString: String?) { get() = kilobyteString?.toLongOrNull()?.let { val units = arrayOf("KB", "MB", "GB", "TB") val conversion = (log10(it.toDouble()) / log10(1024.0)).toInt() - ( - DecimalFormat("#,##0.#") - .format(it / 1024.0.pow(conversion.toDouble())) + - " " + - units[conversion] - ) + DecimalFormat("#,##0.#") + .format(it / 1024.0.pow(conversion.toDouble())) + + " " + + units[conversion] } ?: "" } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/adapter/BookOnDiskDelegate.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/adapter/BookOnDiskDelegate.kt index 5d36ba184..b3ee19e1e 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/adapter/BookOnDiskDelegate.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/adapter/BookOnDiskDelegate.kt @@ -48,7 +48,7 @@ sealed class BookOnDiskDelegate(containerView: Vie itemBookBinding.itemBookTitle.text = book.title itemBookBinding.itemBookDate.text = book.date itemBookBinding.itemBookDescription.text = book.description - itemBookBinding.itemBookSize.text = (KiloByte(book.size).humanReadable) + itemBookBinding.itemBookSize.text = KiloByte(book.size).humanReadable book.articleCount?.let { itemBookBinding.itemBookArticleCount.text = ArticleCount(it).toHumanReadable(containerView.context) diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/utils/NetworkUtilsTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/utils/NetworkUtilsTest.kt index fd098a0e6..fb220974a 100644 --- a/core/src/test/java/org/kiwix/kiwixmobile/core/utils/NetworkUtilsTest.kt +++ b/core/src/test/java/org/kiwix/kiwixmobile/core/utils/NetworkUtilsTest.kt @@ -46,39 +46,39 @@ class NetworkUtilsTest { every { connectivity.allNetworkInfo } returns networkInfos // one network is connected - every { (networkInfo1.state) } returns NetworkInfo.State.CONNECTED - every { (networkInfo2.state) } returns NetworkInfo.State.DISCONNECTING + every { networkInfo1.state } returns NetworkInfo.State.CONNECTED + every { networkInfo2.state } returns NetworkInfo.State.DISCONNECTING assertEquals(true, NetworkUtils.isNetworkAvailable(context)) - every { (networkInfo1.state) } returns NetworkInfo.State.DISCONNECTING - every { (networkInfo2.state) } returns NetworkInfo.State.CONNECTING + every { networkInfo1.state } returns NetworkInfo.State.DISCONNECTING + every { networkInfo2.state } returns NetworkInfo.State.CONNECTING assertEquals(false, NetworkUtils.isNetworkAvailable(context)) // no network is available - every { (networkInfo1.state) } returns NetworkInfo.State.DISCONNECTED - every { (networkInfo2.state) } returns NetworkInfo.State.DISCONNECTED + every { networkInfo1.state } returns NetworkInfo.State.DISCONNECTED + every { networkInfo2.state } returns NetworkInfo.State.DISCONNECTED assertEquals(false, NetworkUtils.isNetworkAvailable(context)) } @Test fun test_isNetworkConnectionOK() { - every { (networkInfo2.state) } returns NetworkInfo.State.CONNECTING + every { networkInfo2.state } returns NetworkInfo.State.CONNECTING assertFalse(NetworkUtils.isNetworkConnectionOK(networkInfo2)) - every { (networkInfo2.state) } returns NetworkInfo.State.CONNECTED + every { networkInfo2.state } returns NetworkInfo.State.CONNECTED assertTrue(NetworkUtils.isNetworkConnectionOK(networkInfo2)) } @Test fun testWifiAvailability() { - every { (context.getSystemService(Context.CONNECTIVITY_SERVICE)) } returns connectivity - every { (connectivity.activeNetworkInfo) } returns networkInfo + every { context.getSystemService(Context.CONNECTIVITY_SERVICE) } returns connectivity + every { connectivity.activeNetworkInfo } returns networkInfo // SDK >= 23 NetworkUtils.sdkVersionForTesting = 23 // on Mobile Data - every { (networkInfo.type) } returns ConnectivityManager.TYPE_MOBILE + every { networkInfo.type } returns ConnectivityManager.TYPE_MOBILE assertEquals(false, NetworkUtils.isWiFi(context)) // verify that the correct methods are used according to the build SDK version verify { @@ -88,15 +88,15 @@ class NetworkUtilsTest { verify(exactly = 0) { connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI) } // on WIFI connected - every { (networkInfo.type) } returns ConnectivityManager.TYPE_WIFI - every { (networkInfo.isConnected) } returns java.lang.Boolean.TRUE + every { networkInfo.type } returns ConnectivityManager.TYPE_WIFI + every { networkInfo.isConnected } returns java.lang.Boolean.TRUE assertEquals(true, NetworkUtils.isWiFi(context)) verify(exactly = 2) { connectivity.activeNetworkInfo } verify(exactly = 0) { connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI) } // on WIFI disconnected - every { (networkInfo.type) } returns ConnectivityManager.TYPE_WIFI - every { (networkInfo.isConnected) } returns java.lang.Boolean.FALSE + every { networkInfo.type } returns ConnectivityManager.TYPE_WIFI + every { networkInfo.isConnected } returns java.lang.Boolean.FALSE assertEquals(false, NetworkUtils.isWiFi(context)) verify(exactly = 3) { connectivity.activeNetworkInfo } verify(exactly = 0) { connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI) } @@ -105,14 +105,14 @@ class NetworkUtilsTest { NetworkUtils.sdkVersionForTesting = 22 // WIFI connected - every { (connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI)) } returns networkInfo - every { (networkInfo.isConnected) } returns true + every { connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI) } returns networkInfo + every { networkInfo.isConnected } returns true assertEquals(true, NetworkUtils.isWiFi(context)) verify { connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI) } // WIFI disconnected - every { (connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI)) } returns networkInfo - every { (networkInfo.isConnected) } returns false + every { connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI) } returns networkInfo + every { networkInfo.isConnected } returns false assertEquals(false, NetworkUtils.isWiFi(context)) verify(exactly = 2) { connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI) } } @@ -177,9 +177,9 @@ class NetworkUtilsTest { @Test fun testParsedURL() { - every { (context.getString(R.string.zim_no_pic)) } returns "No Pictures" - every { (context.getString(R.string.zim_no_vid)) } returns "No Videos" - every { (context.getString(R.string.zim_simple)) } returns "Simple" + every { context.getString(R.string.zim_no_pic) } returns "No Pictures" + every { context.getString(R.string.zim_no_vid) } returns "No Videos" + every { context.getString(R.string.zim_simple) } returns "Simple" assertEquals( "URL Parsing on empty string", "",