Loading app/src/main/java/foundation/e/apps/data/application/ApplicationDataManager.kt +0 −4 Original line number Diff line number Diff line Loading @@ -111,13 +111,9 @@ class ApplicationDataManager @Inject constructor( return if (application.is_pwa) { pwaManager.getPwaStatus(application) } else { val versionName = if (application.isSystemApp) { application.latest_version_number } else "" appLoungePackageManager.getPackageStatus( application.package_name, application.latest_version_code, versionName, ) } } Loading app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt +3 −10 Original line number Diff line number Diff line Loading @@ -71,16 +71,10 @@ class AppLoungePackageManager @Inject constructor( } } private fun isUpdatable(packageName: String, versionCode: Int, versionName: String): Boolean { private fun isUpdatable(packageName: String, versionCode: Int): Boolean { val packageInfo = getPackageInfo(packageName) ?: return false val installedVersionNumber = PackageInfoCompat.getLongVersionCode(packageInfo) val installedVersionName = packageInfo.versionName val isVersionNumberHigher = versionCode.toLong() > installedVersionNumber val isVersionNameHigher = versionName.isNotBlank() && versionName > installedVersionName return isVersionNumberHigher || isVersionNameHigher return versionCode.toLong() > installedVersionNumber } fun getLaunchIntent(packageName: String): Intent? { Loading @@ -105,10 +99,9 @@ class AppLoungePackageManager @Inject constructor( fun getPackageStatus( packageName: String, versionCode: Int, versionName: String = "", ): Status { return if (isInstalled(packageName)) { if (isUpdatable(packageName, versionCode, versionName)) { if (isUpdatable(packageName, versionCode)) { Status.UPDATABLE } else { Status.INSTALLED Loading app/src/test/java/foundation/e/apps/apps/AppsApiTest.kt +0 −9 Original line number Diff line number Diff line Loading @@ -226,7 +226,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demoone"), eq(123), eq(""), ) ) .thenReturn( Loading @@ -236,7 +235,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demotwo"), eq(123), eq(""), ) ) .thenReturn( Loading @@ -246,7 +244,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demothree"), eq(123), eq(""), ) ) .thenReturn( Loading Loading @@ -287,7 +284,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demoone"), eq(123), eq(""), ) ) .thenReturn( Loading @@ -297,7 +293,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demotwo"), eq(123), eq(""), ) ) .thenReturn( Loading @@ -307,7 +302,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demothree"), eq(123), eq(""), ) ) .thenReturn( Loading Loading @@ -348,7 +342,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demoone"), eq(123), eq(""), ) ) .thenReturn( Loading @@ -358,7 +351,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demotwo"), eq(123), eq(""), ) ) .thenReturn( Loading @@ -368,7 +360,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demothree"), eq(123), eq(""), ) ) .thenReturn( Loading app/src/test/java/foundation/e/apps/fused/SearchApiImplTest.kt +1 −1 Original line number Diff line number Diff line Loading @@ -201,7 +201,7 @@ class SearchApiImplTest { willThrowException: Boolean = false ) { Mockito.`when`(pwaManager.getPwaStatus(any())).thenReturn(Status.UNAVAILABLE) Mockito.`when`(appLoungePackageManager.getPackageStatus(any(), any(), any())) Mockito.`when`(appLoungePackageManager.getPackageStatus(any(), any())) .thenReturn(Status.UNAVAILABLE) Mockito.`when`( cleanApkAppsRepository.getSearchResult( Loading app/src/test/java/foundation/e/apps/home/HomeApiTest.kt +1 −1 Original line number Diff line number Diff line Loading @@ -133,7 +133,7 @@ class HomeApiTest { any() ) ).thenReturn(listOf()) Mockito.`when`(appLoungePackageManager.getPackageStatus(any(), any(), any())) Mockito.`when`(appLoungePackageManager.getPackageStatus(any(), any())) .thenReturn(Status.UNAVAILABLE) var hasLimitedDataFound = false Loading Loading
app/src/main/java/foundation/e/apps/data/application/ApplicationDataManager.kt +0 −4 Original line number Diff line number Diff line Loading @@ -111,13 +111,9 @@ class ApplicationDataManager @Inject constructor( return if (application.is_pwa) { pwaManager.getPwaStatus(application) } else { val versionName = if (application.isSystemApp) { application.latest_version_number } else "" appLoungePackageManager.getPackageStatus( application.package_name, application.latest_version_code, versionName, ) } } Loading
app/src/main/java/foundation/e/apps/install/pkg/AppLoungePackageManager.kt +3 −10 Original line number Diff line number Diff line Loading @@ -71,16 +71,10 @@ class AppLoungePackageManager @Inject constructor( } } private fun isUpdatable(packageName: String, versionCode: Int, versionName: String): Boolean { private fun isUpdatable(packageName: String, versionCode: Int): Boolean { val packageInfo = getPackageInfo(packageName) ?: return false val installedVersionNumber = PackageInfoCompat.getLongVersionCode(packageInfo) val installedVersionName = packageInfo.versionName val isVersionNumberHigher = versionCode.toLong() > installedVersionNumber val isVersionNameHigher = versionName.isNotBlank() && versionName > installedVersionName return isVersionNumberHigher || isVersionNameHigher return versionCode.toLong() > installedVersionNumber } fun getLaunchIntent(packageName: String): Intent? { Loading @@ -105,10 +99,9 @@ class AppLoungePackageManager @Inject constructor( fun getPackageStatus( packageName: String, versionCode: Int, versionName: String = "", ): Status { return if (isInstalled(packageName)) { if (isUpdatable(packageName, versionCode, versionName)) { if (isUpdatable(packageName, versionCode)) { Status.UPDATABLE } else { Status.INSTALLED Loading
app/src/test/java/foundation/e/apps/apps/AppsApiTest.kt +0 −9 Original line number Diff line number Diff line Loading @@ -226,7 +226,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demoone"), eq(123), eq(""), ) ) .thenReturn( Loading @@ -236,7 +235,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demotwo"), eq(123), eq(""), ) ) .thenReturn( Loading @@ -246,7 +244,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demothree"), eq(123), eq(""), ) ) .thenReturn( Loading Loading @@ -287,7 +284,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demoone"), eq(123), eq(""), ) ) .thenReturn( Loading @@ -297,7 +293,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demotwo"), eq(123), eq(""), ) ) .thenReturn( Loading @@ -307,7 +302,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demothree"), eq(123), eq(""), ) ) .thenReturn( Loading Loading @@ -348,7 +342,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demoone"), eq(123), eq(""), ) ) .thenReturn( Loading @@ -358,7 +351,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demotwo"), eq(123), eq(""), ) ) .thenReturn( Loading @@ -368,7 +360,6 @@ class AppsApiTest { appLoungePackageManager.getPackageStatus( eq("foundation.e.demothree"), eq(123), eq(""), ) ) .thenReturn( Loading
app/src/test/java/foundation/e/apps/fused/SearchApiImplTest.kt +1 −1 Original line number Diff line number Diff line Loading @@ -201,7 +201,7 @@ class SearchApiImplTest { willThrowException: Boolean = false ) { Mockito.`when`(pwaManager.getPwaStatus(any())).thenReturn(Status.UNAVAILABLE) Mockito.`when`(appLoungePackageManager.getPackageStatus(any(), any(), any())) Mockito.`when`(appLoungePackageManager.getPackageStatus(any(), any())) .thenReturn(Status.UNAVAILABLE) Mockito.`when`( cleanApkAppsRepository.getSearchResult( Loading
app/src/test/java/foundation/e/apps/home/HomeApiTest.kt +1 −1 Original line number Diff line number Diff line Loading @@ -133,7 +133,7 @@ class HomeApiTest { any() ) ).thenReturn(listOf()) Mockito.`when`(appLoungePackageManager.getPackageStatus(any(), any(), any())) Mockito.`when`(appLoungePackageManager.getPackageStatus(any(), any())) .thenReturn(Status.UNAVAILABLE) var hasLimitedDataFound = false Loading