From 0c14512dd29d9fcb9535ae13af117ef2ea654f64 Mon Sep 17 00:00:00 2001 From: Sharkaboi Date: Sat, 23 Mar 2024 21:39:20 +0530 Subject: [PATCH 01/30] Bump to v1.0.3 --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 113246f..3a46d89 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'com.github.Sharkaboi' -version = 'v1.0.2' +version = 'v1.0.3' repositories { google() From 8a5864f50cde295ffb0b44a1e2a5d48249f305f2 Mon Sep 17 00:00:00 2001 From: Sharkaboi Date: Sat, 23 Mar 2024 21:39:39 +0530 Subject: [PATCH 02/30] Remove unwanted resources --- build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.gradle b/build.gradle index 6e00895..a8080e9 100644 --- a/build.gradle +++ b/build.gradle @@ -37,8 +37,4 @@ allprojects { } maven { url "https://jitpack.io" } } -} - -task clean(type: Delete) { - delete rootProject.buildDir } \ No newline at end of file From 27c1c6986f3847b99ab8c8ae603f02d1cbdc62c2 Mon Sep 17 00:00:00 2001 From: Sharkaboi Date: Sat, 23 Mar 2024 21:49:38 +0530 Subject: [PATCH 03/30] Gradle changes --- build.gradle | 3 +++ library/build.gradle | 40 ++++++++++++++-------------------------- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index a8080e9..16720b8 100644 --- a/build.gradle +++ b/build.gradle @@ -27,6 +27,9 @@ buildscript { classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktLintVersion" } } +plugins { + id 'com.google.devtools.ksp' version '1.8.10-1.0.9' apply false +} allprojects { repositories { diff --git a/library/build.gradle b/library/build.gradle index 3a46d89..6910384 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.library' id 'kotlin-android' - id 'kotlin-kapt' + id 'com.google.devtools.ksp' id 'org.jlleitschuh.gradle.ktlint' id 'maven-publish' } @@ -9,54 +9,42 @@ plugins { group = 'com.github.Sharkaboi' version = 'v1.0.3' -repositories { - google() - mavenCentral() - maven { - url "https://plugins.gradle.org/m2/" - } - maven { url "https://jitpack.io" } -} - android { - compileSdkVersion 31 + compileSdkVersion 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 34 versionCode 1 - versionName "1.0.2" + versionName "1.0.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } } dependencies { - implementation "androidx.core:core-ktx:$ktxCoreVersion" - implementation "androidx.appcompat:appcompat:$appCompatVersion" - api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - api "com.squareup.retrofit2:retrofit:$retrofitVersion" - api "com.squareup.moshi:moshi-kotlin:$moshiVersion" - kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" - api "com.squareup.retrofit2:converter-moshi:$moshiRetrofitVersion" - api "com.squareup.retrofit2:converter-simplexml:$simpleXmlVersion" - api "com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:$coroutineCallAdapterVersion" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" + implementation "com.squareup.retrofit2:retrofit:$retrofitVersion" + implementation "com.squareup.moshi:moshi-kotlin:$moshiVersion" + ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" + implementation "com.squareup.retrofit2:converter-moshi:$moshiRetrofitVersion" + implementation "com.squareup.retrofit2:converter-simplexml:$simpleXmlVersion" testImplementation "junit:junit:$jUnitVersion" testImplementation "io.mockk:mockk:$mockkVersion" } From 012357de5c89f60da635ad27ed6d2b7a9f745bef Mon Sep 17 00:00:00 2001 From: Sharkaboi Date: Sat, 23 Mar 2024 22:08:49 +0530 Subject: [PATCH 04/30] Project structure changes --- build.gradle | 24 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 6 ++--- library/build.gradle | 5 ++-- library/src/main/AndroidManifest.xml | 4 +--- .../appupdatechecker/AppUpdateChecker.kt | 8 +++---- .../provider/AppUpdateServices.kt | 5 ---- .../sources/fdroid/FdroidResponse.kt | 3 --- .../sources/fdroid/FdroidService.kt | 4 ++-- .../sources/github/GithubResponse.kt | 2 -- .../sources/github/GithubService.kt | 4 ++-- .../sources/json/JsonResponse.kt | 2 -- .../sources/json/JsonService.kt | 4 ++-- .../sources/xml/XMLResponse.kt | 2 -- .../sources/xml/XMLService.kt | 4 ++-- .../appupdatechecker/AppUpdateCheckerTest.kt | 3 ++- .../sharkaboi/appupdatechecker/FdroidTest.kt | 5 ++-- .../sharkaboi/appupdatechecker/GithubTest.kt | 3 ++- .../sharkaboi/appupdatechecker/JsonTest.kt | 3 ++- .../sharkaboi/appupdatechecker/XMLTest.kt | 3 ++- 19 files changed, 42 insertions(+), 52 deletions(-) rename library/src/test/java/com/{ => github}/sharkaboi/appupdatechecker/AppUpdateCheckerTest.kt (94%) rename library/src/test/java/com/{ => github}/sharkaboi/appupdatechecker/FdroidTest.kt (94%) rename library/src/test/java/com/{ => github}/sharkaboi/appupdatechecker/GithubTest.kt (97%) rename library/src/test/java/com/{ => github}/sharkaboi/appupdatechecker/JsonTest.kt (97%) rename library/src/test/java/com/{ => github}/sharkaboi/appupdatechecker/XMLTest.kt (97%) diff --git a/build.gradle b/build.gradle index 16720b8..65478ba 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,17 @@ buildscript { ext { - agpVersion = "4.2.2" - kotlinVersion = "1.5.30" - ktxCoreVersion = "1.6.0" - appCompatVersion = "1.3.1" - coroutinesVersion = "1.5.2" - retrofitVersion = "2.9.0" - moshiVersion = "1.12.0" - moshiRetrofitVersion = "2.9.0" - simpleXmlVersion = "2.9.0" + agpVersion = "8.2.0" + kotlinVersion = "1.9.23" + coroutinesVersion = '1.8.0' + retrofitVersion = '2.10.0' + moshiVersion = '1.15.1' + moshiRetrofitVersion = '2.10.0' + simpleXmlVersion = '2.10.0' ktLintVersion = "10.1.0" - coroutineCallAdapterVersion = "0.9.2" jUnitVersion = "4.13.2" - mockkVersion = "1.12.0" + mockkVersion = '1.13.10' } + repositories { google() mavenCentral() @@ -21,14 +19,16 @@ buildscript { url "https://plugins.gradle.org/m2/" } } + dependencies { classpath "com.android.tools.build:gradle:$agpVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktLintVersion" } } + plugins { - id 'com.google.devtools.ksp' version '1.8.10-1.0.9' apply false + id 'com.google.devtools.ksp' version '1.9.23-1.0.19' apply false } allprojects { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 30a925a..44c1065 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Sep 12 11:25:08 IST 2021 +#Sat Mar 23 21:51:53 IST 2024 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/library/build.gradle b/library/build.gradle index 6910384..7a596d7 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -6,14 +6,15 @@ plugins { id 'maven-publish' } -group = 'com.github.Sharkaboi' +group = 'com.github.sharkaboi.appupdatechecker' version = 'v1.0.3' android { compileSdkVersion 34 defaultConfig { - minSdkVersion 21 + namespace "com.github.sharkaboi.appupdatechecker" + minSdk 19 targetSdkVersion 34 versionCode 1 versionName "1.0.3" diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 227dea5..f0f34af 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,6 +1,4 @@ - - + \ No newline at end of file diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/AppUpdateChecker.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/AppUpdateChecker.kt index 51b9eb3..d32bff6 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/AppUpdateChecker.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/AppUpdateChecker.kt @@ -52,7 +52,7 @@ class AppUpdateChecker( return try { val release = AppUpdateServices.fDroidService.getReleasesAsync( packageName = packageName - ).await() + ) if (release.isAfterVersion(currentVersionTag)) { release.toUpdateAvailableState(modifiedSource) } else { @@ -74,7 +74,7 @@ class AppUpdateChecker( val release = AppUpdateServices.githubService.getLatestReleaseAsync( owner = source.ownerUsername, repo = source.repoName - ).await() + ) if (release.tagName.isAfterVersion(currentVersionTag)) { release.toUpdateAvailableState(source) } else { @@ -95,7 +95,7 @@ class AppUpdateChecker( return try { val release = AppUpdateServices.jsonService.getJsonReleaseMetaDataAsync( url = source.jsonEndpoint - ).await() + ) if (release.latestVersion.isAfterVersion(currentVersionTag)) { release.toUpdateAvailableState(source) } else { @@ -116,7 +116,7 @@ class AppUpdateChecker( return try { val release = AppUpdateServices.xmlService.getXMLReleaseMetaDataAsync( url = source.xmlEndpoint - ).await() + ) if (release.latestVersion.isAfterVersion(currentVersionTag)) { release.toUpdateAvailableState(source) } else { diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/provider/AppUpdateServices.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/provider/AppUpdateServices.kt index 8e6fbf2..fd32471 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/provider/AppUpdateServices.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/provider/AppUpdateServices.kt @@ -1,6 +1,5 @@ package com.sharkaboi.appupdatechecker.provider -import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory import com.sharkaboi.appupdatechecker.sources.fdroid.FdroidConstants import com.sharkaboi.appupdatechecker.sources.fdroid.FdroidService import com.sharkaboi.appupdatechecker.sources.github.GithubConstants @@ -18,7 +17,6 @@ internal object AppUpdateServices { val fDroidService: FdroidService by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { Retrofit.Builder() .baseUrl(FdroidConstants.BASE_URL) - .addCallAdapterFactory(CoroutineCallAdapterFactory()) .addConverterFactory(MoshiConverterFactory.create()) .build() .create(FdroidService::class.java) @@ -27,7 +25,6 @@ internal object AppUpdateServices { val jsonService: JsonService by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { Retrofit.Builder() .baseUrl(JsonConstants.BASE_URL) - .addCallAdapterFactory(CoroutineCallAdapterFactory()) .addConverterFactory(MoshiConverterFactory.create()) .build() .create(JsonService::class.java) @@ -36,7 +33,6 @@ internal object AppUpdateServices { val xmlService: XMLService by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { Retrofit.Builder() .baseUrl(XMLConstants.BASE_URL) - .addCallAdapterFactory(CoroutineCallAdapterFactory()) .addConverterFactory(SimpleXmlConverterFactory.create()) .build() .create(XMLService::class.java) @@ -45,7 +41,6 @@ internal object AppUpdateServices { val githubService: GithubService by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { Retrofit.Builder() .baseUrl(GithubConstants.BASE_URL) - .addCallAdapterFactory(CoroutineCallAdapterFactory()) .addConverterFactory(MoshiConverterFactory.create()) .build() .create(GithubService::class.java) diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidResponse.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidResponse.kt index ce17c02..9e19b68 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidResponse.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidResponse.kt @@ -1,10 +1,8 @@ package com.sharkaboi.appupdatechecker.sources.fdroid -import androidx.annotation.Keep import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -@Keep @JsonClass(generateAdapter = true) data class FdroidResponse( @Json(name = "packageName") @@ -12,7 +10,6 @@ data class FdroidResponse( @Json(name = "packages") val packages: List ) { - @Keep @JsonClass(generateAdapter = true) data class Package( @Json(name = "versionCode") diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidService.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidService.kt index 3e2e8b8..92d6d2b 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidService.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidService.kt @@ -7,7 +7,7 @@ import retrofit2.http.Path internal interface FdroidService { @GET(FdroidConstants.PATH) - fun getReleasesAsync( + suspend fun getReleasesAsync( @Path(FdroidConstants.PACKAGE_PATH_ID) packageName: String - ): Deferred + ): FdroidResponse } diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubResponse.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubResponse.kt index cfc0c24..20c27c6 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubResponse.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubResponse.kt @@ -1,10 +1,8 @@ package com.sharkaboi.appupdatechecker.sources.github -import androidx.annotation.Keep import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -@Keep @JsonClass(generateAdapter = true) internal data class GithubResponse( @Json(name = "body") diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubService.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubService.kt index cc80222..ab1798e 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubService.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubService.kt @@ -7,8 +7,8 @@ import retrofit2.http.Path internal interface GithubService { @GET(GithubConstants.PATH) - fun getLatestReleaseAsync( + suspend fun getLatestReleaseAsync( @Path(GithubConstants.OWNER_PATH_ID) owner: String, @Path(GithubConstants.REPO_PATH_ID) repo: String, - ): Deferred + ): GithubResponse } diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonResponse.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonResponse.kt index 3211fc5..0dea454 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonResponse.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonResponse.kt @@ -1,10 +1,8 @@ package com.sharkaboi.appupdatechecker.sources.json -import androidx.annotation.Keep import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -@Keep @JsonClass(generateAdapter = true) data class JsonResponse( @Json(name = "latestVersion") diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonService.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonService.kt index 3ef7db2..c57708b 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonService.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonService.kt @@ -6,7 +6,7 @@ import retrofit2.http.Url internal interface JsonService { @GET - fun getJsonReleaseMetaDataAsync( + suspend fun getJsonReleaseMetaDataAsync( @Url url: String - ): Deferred + ): JsonResponse } diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLResponse.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLResponse.kt index a19d8b1..675bebc 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLResponse.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLResponse.kt @@ -1,10 +1,8 @@ package com.sharkaboi.appupdatechecker.sources.xml -import androidx.annotation.Keep import org.simpleframework.xml.Element import org.simpleframework.xml.Root -@Keep @Root(name = "version") data class XMLResponse( @field:Element(name = "latestVersion") diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLService.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLService.kt index f7afc21..09930da 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLService.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLService.kt @@ -6,7 +6,7 @@ import retrofit2.http.Url interface XMLService { @GET - fun getXMLReleaseMetaDataAsync( + suspend fun getXMLReleaseMetaDataAsync( @Url url: String - ): Deferred + ): XMLResponse } diff --git a/library/src/test/java/com/sharkaboi/appupdatechecker/AppUpdateCheckerTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/AppUpdateCheckerTest.kt similarity index 94% rename from library/src/test/java/com/sharkaboi/appupdatechecker/AppUpdateCheckerTest.kt rename to library/src/test/java/com/github/sharkaboi/appupdatechecker/AppUpdateCheckerTest.kt index b12870b..e6fac3c 100644 --- a/library/src/test/java/com/sharkaboi/appupdatechecker/AppUpdateCheckerTest.kt +++ b/library/src/test/java/com/github/sharkaboi/appupdatechecker/AppUpdateCheckerTest.kt @@ -1,6 +1,7 @@ -package com.sharkaboi.appupdatechecker +package com.github.sharkaboi.appupdatechecker import android.content.Context +import com.sharkaboi.appupdatechecker.AppUpdateChecker import com.sharkaboi.appupdatechecker.extensions.isInternetConnected import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource import com.sharkaboi.appupdatechecker.models.UpdateState diff --git a/library/src/test/java/com/sharkaboi/appupdatechecker/FdroidTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/FdroidTest.kt similarity index 94% rename from library/src/test/java/com/sharkaboi/appupdatechecker/FdroidTest.kt rename to library/src/test/java/com/github/sharkaboi/appupdatechecker/FdroidTest.kt index 42336d5..38123cb 100644 --- a/library/src/test/java/com/sharkaboi/appupdatechecker/FdroidTest.kt +++ b/library/src/test/java/com/github/sharkaboi/appupdatechecker/FdroidTest.kt @@ -1,6 +1,7 @@ -package com.sharkaboi.appupdatechecker +package com.github.sharkaboi.appupdatechecker import android.content.Context +import com.sharkaboi.appupdatechecker.AppUpdateChecker import com.sharkaboi.appupdatechecker.extensions.isInternetConnected import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource import com.sharkaboi.appupdatechecker.models.UpdateState @@ -19,7 +20,7 @@ class FdroidTest { context = mockk(relaxed = true) mockkStatic("com.sharkaboi.appupdatechecker.extensions.ContextExtensionsKt") every { context.isInternetConnected } returns true - every { context.packageName } returns "com.simplemobiletools.gallery.pro" + every { context.packageName } returns "org.fdroid.fdroid" } @Test diff --git a/library/src/test/java/com/sharkaboi/appupdatechecker/GithubTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/GithubTest.kt similarity index 97% rename from library/src/test/java/com/sharkaboi/appupdatechecker/GithubTest.kt rename to library/src/test/java/com/github/sharkaboi/appupdatechecker/GithubTest.kt index e2db4f6..1bad6b9 100644 --- a/library/src/test/java/com/sharkaboi/appupdatechecker/GithubTest.kt +++ b/library/src/test/java/com/github/sharkaboi/appupdatechecker/GithubTest.kt @@ -1,6 +1,7 @@ -package com.sharkaboi.appupdatechecker +package com.github.sharkaboi.appupdatechecker import android.content.Context +import com.sharkaboi.appupdatechecker.AppUpdateChecker import com.sharkaboi.appupdatechecker.extensions.isInternetConnected import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource import com.sharkaboi.appupdatechecker.models.UpdateState diff --git a/library/src/test/java/com/sharkaboi/appupdatechecker/JsonTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/JsonTest.kt similarity index 97% rename from library/src/test/java/com/sharkaboi/appupdatechecker/JsonTest.kt rename to library/src/test/java/com/github/sharkaboi/appupdatechecker/JsonTest.kt index 8f14e5f..33f2618 100644 --- a/library/src/test/java/com/sharkaboi/appupdatechecker/JsonTest.kt +++ b/library/src/test/java/com/github/sharkaboi/appupdatechecker/JsonTest.kt @@ -1,6 +1,7 @@ -package com.sharkaboi.appupdatechecker +package com.github.sharkaboi.appupdatechecker import android.content.Context +import com.sharkaboi.appupdatechecker.AppUpdateChecker import com.sharkaboi.appupdatechecker.extensions.isInternetConnected import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource import com.sharkaboi.appupdatechecker.models.UpdateState diff --git a/library/src/test/java/com/sharkaboi/appupdatechecker/XMLTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/XMLTest.kt similarity index 97% rename from library/src/test/java/com/sharkaboi/appupdatechecker/XMLTest.kt rename to library/src/test/java/com/github/sharkaboi/appupdatechecker/XMLTest.kt index 76e8b9a..721b19d 100644 --- a/library/src/test/java/com/sharkaboi/appupdatechecker/XMLTest.kt +++ b/library/src/test/java/com/github/sharkaboi/appupdatechecker/XMLTest.kt @@ -1,6 +1,7 @@ -package com.sharkaboi.appupdatechecker +package com.github.sharkaboi.appupdatechecker import android.content.Context +import com.sharkaboi.appupdatechecker.AppUpdateChecker import com.sharkaboi.appupdatechecker.extensions.isInternetConnected import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource import com.sharkaboi.appupdatechecker.models.UpdateState From 6052375637fde5736090090524df735242d38034 Mon Sep 17 00:00:00 2001 From: Sharkaboi Date: Sun, 24 Mar 2024 02:27:33 +0530 Subject: [PATCH 05/30] Add v1.0.3 changes --- README.md | 2 +- library/build.gradle | 3 +- .../appupdatechecker/AppUpdateChecker.kt | 134 ++----------- .../extensions/ContextExtensions.kt | 31 --- .../extensions/StringExtensions.kt | 27 --- .../extensions/ValidationExtensions.kt | 20 -- .../interfaces/IAppUpdateChecker.kt | 9 - .../mappers/UpdateStateMappers.kt | 45 ----- .../models/AppUpdateCheckerSource.kt | 21 -- .../appupdatechecker/models/Exceptions.kt | 15 ++ .../appupdatechecker/models/UpdateResult.kt | 9 + .../appupdatechecker/models/UpdateState.kt | 46 ----- .../appupdatechecker/models/VersionDetails.kt | 7 + .../provider/AppUpdateServices.kt | 48 ----- .../sources/AppUpdateCheckerSource.kt | 20 ++ .../sources/fdroid/FDroidSource.kt | 69 +++++++ .../sources/fdroid/FdroidExtensions.kt | 9 - .../sources/fdroid/FdroidResponse.kt | 2 +- .../sources/fdroid/FdroidService.kt | 3 +- .../sources/github/GithubService.kt | 3 +- .../sources/github/GithubTagSource.kt | 42 ++++ .../sources/json/JsonConstants.kt | 5 - .../sources/json/JsonResponse.kt | 6 +- .../sources/json/JsonService.kt | 3 +- .../sources/json/JsonSource.kt | 65 +++++++ .../sources/xml/XMLResponse.kt | 9 +- .../sources/xml/XMLService.kt | 3 +- .../appupdatechecker/sources/xml/XMLSource.kt | 65 +++++++ .../DefaultStringVersionComparator.kt | 39 ++++ .../versions/DefaultVersionCodeComparator.kt | 13 ++ .../versions/VersionComparator.kt | 9 + .../appupdatechecker/AppUpdateCheckerTest.kt | 55 ------ .../appupdatechecker/ExceptionsTest.kt | 4 + .../sharkaboi/appupdatechecker/FDroidTest.kt | 110 +++++++++++ .../sharkaboi/appupdatechecker/FdroidTest.kt | 91 --------- .../sharkaboi/appupdatechecker/GithubTest.kt | 182 +++++++++--------- .../sharkaboi/appupdatechecker/JsonTest.kt | 167 +++++++++------- .../appupdatechecker/VersionComparatorTest.kt | 100 ++++++++++ .../sharkaboi/appupdatechecker/XMLTest.kt | 166 +++++++++------- 39 files changed, 872 insertions(+), 785 deletions(-) delete mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/extensions/ContextExtensions.kt delete mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/extensions/StringExtensions.kt delete mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/extensions/ValidationExtensions.kt delete mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/interfaces/IAppUpdateChecker.kt delete mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/mappers/UpdateStateMappers.kt delete mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/models/AppUpdateCheckerSource.kt create mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/models/Exceptions.kt create mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/models/UpdateResult.kt delete mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/models/UpdateState.kt create mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/models/VersionDetails.kt delete mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/provider/AppUpdateServices.kt create mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/sources/AppUpdateCheckerSource.kt create mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FDroidSource.kt delete mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidExtensions.kt create mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubTagSource.kt delete mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonConstants.kt create mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonSource.kt create mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLSource.kt create mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/versions/DefaultStringVersionComparator.kt create mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/versions/DefaultVersionCodeComparator.kt create mode 100644 library/src/main/java/com/sharkaboi/appupdatechecker/versions/VersionComparator.kt delete mode 100644 library/src/test/java/com/github/sharkaboi/appupdatechecker/AppUpdateCheckerTest.kt create mode 100644 library/src/test/java/com/github/sharkaboi/appupdatechecker/ExceptionsTest.kt create mode 100644 library/src/test/java/com/github/sharkaboi/appupdatechecker/FDroidTest.kt delete mode 100644 library/src/test/java/com/github/sharkaboi/appupdatechecker/FdroidTest.kt create mode 100644 library/src/test/java/com/github/sharkaboi/appupdatechecker/VersionComparatorTest.kt diff --git a/README.md b/README.md index 130a7b0..25ac974 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ This is so that you can instantiate with your existing DI setup. * Available sources : ```kotlin // Github source -AppUpdateCheckerSource.GithubSource( +GithubTagSource( ownerUsername = "Sharkaboi", repoName = "AppUpdateChecker" ) diff --git a/library/build.gradle b/library/build.gradle index 7a596d7..4baa79b 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -10,11 +10,10 @@ group = 'com.github.sharkaboi.appupdatechecker' version = 'v1.0.3' android { - compileSdkVersion 34 - defaultConfig { namespace "com.github.sharkaboi.appupdatechecker" minSdk 19 + compileSdk 34 targetSdkVersion 34 versionCode 1 versionName "1.0.3" diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/AppUpdateChecker.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/AppUpdateChecker.kt index d32bff6..ed1cae0 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/AppUpdateChecker.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/AppUpdateChecker.kt @@ -1,133 +1,23 @@ package com.sharkaboi.appupdatechecker -import android.content.Context -import com.sharkaboi.appupdatechecker.extensions.* -import com.sharkaboi.appupdatechecker.interfaces.IAppUpdateChecker -import com.sharkaboi.appupdatechecker.mappers.toUpdateAvailableState -import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource -import com.sharkaboi.appupdatechecker.models.UpdateState -import com.sharkaboi.appupdatechecker.provider.AppUpdateServices -import com.sharkaboi.appupdatechecker.sources.fdroid.isAfterVersion -import kotlinx.coroutines.* - -class AppUpdateChecker( - private val context: Context, - private val source: AppUpdateCheckerSource, - private val currentVersionTag: String = context.installedVersionTag -) : IAppUpdateChecker { - +import com.sharkaboi.appupdatechecker.models.UpdateResult +import com.sharkaboi.appupdatechecker.sources.AppUpdateCheckerSource +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.Deferred +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.async +import kotlinx.coroutines.withContext + +class AppUpdateChecker(private val source: AppUpdateCheckerSource) { private val dispatcher: CoroutineDispatcher = Dispatchers.IO - override suspend fun checkUpdate(): UpdateState = withContext(dispatcher) { + suspend fun checkUpdate(): UpdateResult = withContext(dispatcher) { return@withContext checkUpdateAsync().await() } - override suspend fun checkUpdateAsync(): Deferred = withContext(dispatcher) { + suspend fun checkUpdateAsync(): Deferred = withContext(dispatcher) { return@withContext async { - try { - if (!context.isInternetConnected) { - return@async UpdateState.NoNetworkFound - } - require(currentVersionTag.matches(versionRegex)) { "Invalid current version tag" } - return@async when (source) { - is AppUpdateCheckerSource.FDroidSource -> handleFDroidCheck() - is AppUpdateCheckerSource.GithubSource -> handleGithubCheck() - is AppUpdateCheckerSource.JsonSource -> handleJsonCheck() - is AppUpdateCheckerSource.XMLSource -> handleXmlCheck() - } - } catch (e: Exception) { - e.printStackTrace() - return@async UpdateState.GenericError(e) - } - } - } - - private suspend fun handleFDroidCheck(): UpdateState { - require(source is AppUpdateCheckerSource.FDroidSource) { "Invalid source" } - val packageName = source.packageName ?: context.packageName - val modifiedSource = source.copy( - packageName = packageName - ) - if (modifiedSource.isValid()) { - return try { - val release = AppUpdateServices.fDroidService.getReleasesAsync( - packageName = packageName - ) - if (release.isAfterVersion(currentVersionTag)) { - release.toUpdateAvailableState(modifiedSource) - } else { - UpdateState.LatestVersionInstalled - } - } catch (e: Exception) { - e.printStackTrace() - UpdateState.FDroidInvalid - } - } else { - return UpdateState.FDroidMalformed - } - } - - private suspend fun handleGithubCheck(): UpdateState { - require(source is AppUpdateCheckerSource.GithubSource) { "Invalid source" } - if (source.isValid()) { - return try { - val release = AppUpdateServices.githubService.getLatestReleaseAsync( - owner = source.ownerUsername, - repo = source.repoName - ) - if (release.tagName.isAfterVersion(currentVersionTag)) { - release.toUpdateAvailableState(source) - } else { - UpdateState.LatestVersionInstalled - } - } catch (e: Exception) { - e.printStackTrace() - UpdateState.GithubInvalid - } - } else { - return UpdateState.GithubMalformed - } - } - - private suspend fun handleJsonCheck(): UpdateState { - require(source is AppUpdateCheckerSource.JsonSource) { "Invalid source" } - if (source.isValid()) { - return try { - val release = AppUpdateServices.jsonService.getJsonReleaseMetaDataAsync( - url = source.jsonEndpoint - ) - if (release.latestVersion.isAfterVersion(currentVersionTag)) { - release.toUpdateAvailableState(source) - } else { - UpdateState.LatestVersionInstalled - } - } catch (e: Exception) { - e.printStackTrace() - UpdateState.JSONInvalid - } - } else { - return UpdateState.JSONMalformed - } - } - - private suspend fun handleXmlCheck(): UpdateState { - require(source is AppUpdateCheckerSource.XMLSource) { "Invalid source" } - if (source.isValid()) { - return try { - val release = AppUpdateServices.xmlService.getXMLReleaseMetaDataAsync( - url = source.xmlEndpoint - ) - if (release.latestVersion.isAfterVersion(currentVersionTag)) { - release.toUpdateAvailableState(source) - } else { - UpdateState.LatestVersionInstalled - } - } catch (e: Exception) { - e.printStackTrace() - UpdateState.XMLInvalid - } - } else { - return UpdateState.XMLMalformed + return@async source.getUpdateState() } } } diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/extensions/ContextExtensions.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/extensions/ContextExtensions.kt deleted file mode 100644 index a53afa9..0000000 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/extensions/ContextExtensions.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.sharkaboi.appupdatechecker.extensions - -import android.content.Context -import android.net.ConnectivityManager -import android.net.NetworkCapabilities -import android.os.Build - -internal val Context.isInternetConnected: Boolean - get() { - val connectivityManager = - this.getSystemService(Context.CONNECTIVITY_SERVICE) as? ConnectivityManager - return connectivityManager?.let { cm -> - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - cm.activeNetwork?.let { an -> - val networkCapabilities = cm.getNetworkCapabilities(an) - networkCapabilities?.let { nc -> - nc.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) || - nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) - } - } - } else { - val netInfo = cm.activeNetworkInfo - netInfo != null && netInfo.isConnectedOrConnecting - } - } ?: false - } - -internal val Context.installedVersionTag: String - get() { - return this.packageManager.getPackageInfo(this.packageName, 0).versionName - } diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/extensions/StringExtensions.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/extensions/StringExtensions.kt deleted file mode 100644 index 4315a57..0000000 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/extensions/StringExtensions.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.sharkaboi.appupdatechecker.extensions - -internal fun String.isAfterVersion(other: String): Boolean { - val thisVersionTrimmed = this.trim() - val otherVersionTrimmed = other.trim() - require(thisVersionTrimmed.matches(versionRegex)) { "Current version tag is invalid" } - require(otherVersionTrimmed.matches(versionRegex)) { "Incoming version tag is invalid" } - val thisVersion = thisVersionTrimmed.removePrefix("v").removePrefix("V") - val otherVersion = otherVersionTrimmed.removePrefix("v").removePrefix("V") - if (thisVersion == otherVersion) { - return false - } - val thisParts = thisVersion.split(".").map { it.toLong() } - val otherParts = otherVersion.split(".").map { it.toLong() } - val length = thisParts.size.coerceAtLeast(otherParts.size) - for (i in 0 until length) { - val thisPart = if (i < thisParts.size) thisParts[i] else 0 - val otherPart = if (i < otherParts.size) otherParts[i] else 0 - if (thisPart == otherPart) continue - if (thisPart < otherPart) return false - if (thisPart > otherPart) return true - } - return false -} - -// Starts with v or V and followed by matched numbers and dots. -internal val versionRegex = Regex("[v|V]?\\d+(.\\d+)*") diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/extensions/ValidationExtensions.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/extensions/ValidationExtensions.kt deleted file mode 100644 index a6bcc58..0000000 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/extensions/ValidationExtensions.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.sharkaboi.appupdatechecker.extensions - -import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource -import okhttp3.HttpUrl - -internal fun AppUpdateCheckerSource.GithubSource.isValid(): Boolean { - return ownerUsername.isNotBlank() && repoName.isNotBlank() -} - -internal fun AppUpdateCheckerSource.JsonSource.isValid(): Boolean { - return HttpUrl.parse(jsonEndpoint) != null && jsonEndpoint.isNotBlank() -} - -internal fun AppUpdateCheckerSource.XMLSource.isValid(): Boolean { - return HttpUrl.parse(xmlEndpoint) != null && xmlEndpoint.isNotBlank() -} - -internal fun AppUpdateCheckerSource.FDroidSource.isValid(): Boolean { - return packageName != null && packageName.isNotBlank() && packageName.contains('.') -} diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/interfaces/IAppUpdateChecker.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/interfaces/IAppUpdateChecker.kt deleted file mode 100644 index e87a1df..0000000 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/interfaces/IAppUpdateChecker.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.sharkaboi.appupdatechecker.interfaces - -import com.sharkaboi.appupdatechecker.models.UpdateState -import kotlinx.coroutines.Deferred - -internal interface IAppUpdateChecker { - suspend fun checkUpdate(): UpdateState - suspend fun checkUpdateAsync(): Deferred -} diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/mappers/UpdateStateMappers.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/mappers/UpdateStateMappers.kt deleted file mode 100644 index 90bd46b..0000000 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/mappers/UpdateStateMappers.kt +++ /dev/null @@ -1,45 +0,0 @@ -package com.sharkaboi.appupdatechecker.mappers - -import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource -import com.sharkaboi.appupdatechecker.models.UpdateState -import com.sharkaboi.appupdatechecker.sources.fdroid.FdroidConstants -import com.sharkaboi.appupdatechecker.sources.fdroid.FdroidResponse -import com.sharkaboi.appupdatechecker.sources.github.GithubResponse -import com.sharkaboi.appupdatechecker.sources.json.JsonResponse -import com.sharkaboi.appupdatechecker.sources.xml.XMLResponse - -internal fun GithubResponse.toUpdateAvailableState(source: AppUpdateCheckerSource): UpdateState.UpdateAvailable { - return UpdateState.UpdateAvailable( - releaseNotes = body, - latestVersionUrl = htmlUrl, - latestVersion = tagName, - source = source - ) -} - -internal fun JsonResponse.toUpdateAvailableState(source: AppUpdateCheckerSource): UpdateState.UpdateAvailable { - return UpdateState.UpdateAvailable( - releaseNotes = releaseNotes, - latestVersionUrl = latestVersionUrl, - latestVersion = latestVersion, - source = source - ) -} - -internal fun FdroidResponse.toUpdateAvailableState(source: AppUpdateCheckerSource): UpdateState.UpdateAvailable { - return UpdateState.UpdateAvailable( - releaseNotes = null, - latestVersionUrl = FdroidConstants.HTML_BASE_URL + this.packageName, - latestVersion = this.packages.first().versionName, - source = source - ) -} - -internal fun XMLResponse.toUpdateAvailableState(source: AppUpdateCheckerSource): UpdateState.UpdateAvailable { - return UpdateState.UpdateAvailable( - releaseNotes = this.releaseNotes, - latestVersionUrl = this.latestVersionUrl, - latestVersion = this.latestVersion, - source = source - ) -} diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/models/AppUpdateCheckerSource.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/models/AppUpdateCheckerSource.kt deleted file mode 100644 index c0f2901..0000000 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/models/AppUpdateCheckerSource.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.sharkaboi.appupdatechecker.models - -sealed class AppUpdateCheckerSource { - - data class GithubSource( - val ownerUsername: String, - val repoName: String - ) : AppUpdateCheckerSource() - - data class FDroidSource( - val packageName: String? = null - ) : AppUpdateCheckerSource() - - data class JsonSource( - val jsonEndpoint: String - ) : AppUpdateCheckerSource() - - data class XMLSource( - val xmlEndpoint: String - ) : AppUpdateCheckerSource() -} diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/models/Exceptions.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/models/Exceptions.kt new file mode 100644 index 0000000..fcb75d0 --- /dev/null +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/models/Exceptions.kt @@ -0,0 +1,15 @@ +package com.sharkaboi.appupdatechecker.models + +sealed class AppUpdateExceptions(message: String) : Exception(message) + +class InvalidVersionException(message: String) : AppUpdateExceptions(message) + +class InvalidPackageNameException(message: String) : AppUpdateExceptions(message) + +class PackageNotFoundException(message: String) : AppUpdateExceptions(message) + +class InvalidUserNameException(message: String) : AppUpdateExceptions(message) + +class InvalidRepositoryNameException(message: String) : AppUpdateExceptions(message) + +class InvalidEndPointException(message: String) : AppUpdateExceptions(message) \ No newline at end of file diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/models/UpdateResult.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/models/UpdateResult.kt new file mode 100644 index 0000000..e1fecea --- /dev/null +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/models/UpdateResult.kt @@ -0,0 +1,9 @@ +package com.sharkaboi.appupdatechecker.models + +sealed interface UpdateResult { + data class UpdateAvailable( + val versionDetails: VersionDetails + ) : UpdateResult + + data object NoUpdate : UpdateResult +} diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/models/UpdateState.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/models/UpdateState.kt deleted file mode 100644 index a321d1e..0000000 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/models/UpdateState.kt +++ /dev/null @@ -1,46 +0,0 @@ -package com.sharkaboi.appupdatechecker.models - -sealed class UpdateState { - - data class UpdateAvailable( - val latestVersion: String, - val latestVersionUrl: String, - val releaseNotes: String?, - val source: AppUpdateCheckerSource - ) : UpdateState() - - // Latest version already installed - object LatestVersionInstalled : UpdateState() - - // GitHub user or repo is empty string - object GithubMalformed : UpdateState() - - // GitHub repo is private or no releases found of matching type - object GithubInvalid : UpdateState() - - // FDroid package name not provided or empty or does not contain '.' - object FDroidMalformed : UpdateState() - - // Package not found in FDroid - object FDroidInvalid : UpdateState() - - // No Internet connection available - object NoNetworkFound : UpdateState() - - // URL for the XML file is not valid - object XMLMalformed : UpdateState() - - // XML file is invalid or is unreachable - object XMLInvalid : UpdateState() - - // URL for the JSON file is not valid - object JSONMalformed : UpdateState() - - // URL for the JSON file is not valid - object JSONInvalid : UpdateState() - - // Generic UpdateState type to handle other UpdateStates - data class GenericError( - val exception: Exception - ) : UpdateState() -} diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/models/VersionDetails.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/models/VersionDetails.kt new file mode 100644 index 0000000..53e92fb --- /dev/null +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/models/VersionDetails.kt @@ -0,0 +1,7 @@ +package com.sharkaboi.appupdatechecker.models + +data class VersionDetails( + val latestVersion: T, + val latestVersionUrl: String, + val releaseNotes: String?, +) diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/provider/AppUpdateServices.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/provider/AppUpdateServices.kt deleted file mode 100644 index fd32471..0000000 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/provider/AppUpdateServices.kt +++ /dev/null @@ -1,48 +0,0 @@ -package com.sharkaboi.appupdatechecker.provider - -import com.sharkaboi.appupdatechecker.sources.fdroid.FdroidConstants -import com.sharkaboi.appupdatechecker.sources.fdroid.FdroidService -import com.sharkaboi.appupdatechecker.sources.github.GithubConstants -import com.sharkaboi.appupdatechecker.sources.github.GithubService -import com.sharkaboi.appupdatechecker.sources.json.JsonConstants -import com.sharkaboi.appupdatechecker.sources.json.JsonService -import com.sharkaboi.appupdatechecker.sources.xml.XMLConstants -import com.sharkaboi.appupdatechecker.sources.xml.XMLService -import retrofit2.Retrofit -import retrofit2.converter.moshi.MoshiConverterFactory -import retrofit2.converter.simplexml.SimpleXmlConverterFactory - -internal object AppUpdateServices { - - val fDroidService: FdroidService by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { - Retrofit.Builder() - .baseUrl(FdroidConstants.BASE_URL) - .addConverterFactory(MoshiConverterFactory.create()) - .build() - .create(FdroidService::class.java) - } - - val jsonService: JsonService by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { - Retrofit.Builder() - .baseUrl(JsonConstants.BASE_URL) - .addConverterFactory(MoshiConverterFactory.create()) - .build() - .create(JsonService::class.java) - } - - val xmlService: XMLService by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { - Retrofit.Builder() - .baseUrl(XMLConstants.BASE_URL) - .addConverterFactory(SimpleXmlConverterFactory.create()) - .build() - .create(XMLService::class.java) - } - - val githubService: GithubService by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { - Retrofit.Builder() - .baseUrl(GithubConstants.BASE_URL) - .addConverterFactory(MoshiConverterFactory.create()) - .build() - .create(GithubService::class.java) - } -} diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/AppUpdateCheckerSource.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/AppUpdateCheckerSource.kt new file mode 100644 index 0000000..7ea06f4 --- /dev/null +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/AppUpdateCheckerSource.kt @@ -0,0 +1,20 @@ +package com.sharkaboi.appupdatechecker.sources + +import com.sharkaboi.appupdatechecker.models.UpdateResult +import com.sharkaboi.appupdatechecker.models.VersionDetails +import com.sharkaboi.appupdatechecker.versions.VersionComparator + +abstract class AppUpdateCheckerSource { + protected abstract val currentVersion: T + protected abstract val versionComparator: VersionComparator + protected abstract suspend fun queryVersionDetails(): VersionDetails + + suspend fun getUpdateState(): UpdateResult { + val versionDetails = queryVersionDetails() + if (versionComparator.isNewerVersion(currentVersion, versionDetails.latestVersion)) { + return UpdateResult.UpdateAvailable(versionDetails) + } + + return UpdateResult.NoUpdate + } +} \ No newline at end of file diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FDroidSource.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FDroidSource.kt new file mode 100644 index 0000000..1f9e85d --- /dev/null +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FDroidSource.kt @@ -0,0 +1,69 @@ +package com.sharkaboi.appupdatechecker.sources.fdroid + +import com.sharkaboi.appupdatechecker.models.InvalidPackageNameException +import com.sharkaboi.appupdatechecker.models.PackageNotFoundException +import com.sharkaboi.appupdatechecker.models.VersionDetails +import com.sharkaboi.appupdatechecker.sources.AppUpdateCheckerSource +import com.sharkaboi.appupdatechecker.versions.DefaultStringVersionComparator +import com.sharkaboi.appupdatechecker.versions.DefaultVersionCodeComparator +import com.sharkaboi.appupdatechecker.versions.VersionComparator +import retrofit2.Retrofit +import retrofit2.converter.moshi.MoshiConverterFactory + + +sealed class FDroidSource : AppUpdateCheckerSource() { + abstract val packageName: String + + private val service = Retrofit.Builder() + .baseUrl(FdroidConstants.BASE_URL) + .addConverterFactory(MoshiConverterFactory.create()) + .build() + .create(FdroidService::class.java) + + protected suspend fun queryResponse(): FdroidResponse.Package { + if (packageName.isBlank()) { + throw InvalidPackageNameException("Invalid package name $packageName") + } + + if (!packageName.contains('.')) { + throw InvalidPackageNameException("Invalid package name $packageName") + } + + val release = service.getReleases(packageName = packageName) + + return release.packages.firstOrNull() + ?: throw PackageNotFoundException("No details found for package name $packageName") + } +} + +data class FDroidVersionNameSource( + override val packageName: String, + override val currentVersion: String, + override val versionComparator: VersionComparator = DefaultStringVersionComparator +) : FDroidSource() { + + override suspend fun queryVersionDetails(): VersionDetails { + val response = queryResponse() + return VersionDetails( + releaseNotes = null, + latestVersionUrl = FdroidConstants.HTML_BASE_URL + this.packageName, + latestVersion = response.versionName, + ) + } +} + +data class FDroidVersionCodeSource( + override val packageName: String, + override val currentVersion: Long, + override val versionComparator: VersionComparator = DefaultVersionCodeComparator +) : FDroidSource() { + + override suspend fun queryVersionDetails(): VersionDetails { + val response = queryResponse() + return VersionDetails( + releaseNotes = null, + latestVersionUrl = FdroidConstants.HTML_BASE_URL + this.packageName, + latestVersion = response.versionCode, + ) + } +} \ No newline at end of file diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidExtensions.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidExtensions.kt deleted file mode 100644 index 694de3f..0000000 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidExtensions.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.sharkaboi.appupdatechecker.sources.fdroid - -import com.sharkaboi.appupdatechecker.extensions.isAfterVersion - -internal fun FdroidResponse.isAfterVersion(currentVersion: String): Boolean { - require(this.packages.isNotEmpty()) { "No package found in FDroid for $packageName" } - val latestVersion = this.packages.first() - return latestVersion.versionName.isAfterVersion(currentVersion) -} diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidResponse.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidResponse.kt index 9e19b68..90c32d1 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidResponse.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidResponse.kt @@ -13,7 +13,7 @@ data class FdroidResponse( @JsonClass(generateAdapter = true) data class Package( @Json(name = "versionCode") - val versionCode: Int, + val versionCode: Long, @Json(name = "versionName") val versionName: String ) diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidService.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidService.kt index 92d6d2b..3810f34 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidService.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/fdroid/FdroidService.kt @@ -1,13 +1,12 @@ package com.sharkaboi.appupdatechecker.sources.fdroid -import kotlinx.coroutines.Deferred import retrofit2.http.GET import retrofit2.http.Path internal interface FdroidService { @GET(FdroidConstants.PATH) - suspend fun getReleasesAsync( + suspend fun getReleases( @Path(FdroidConstants.PACKAGE_PATH_ID) packageName: String ): FdroidResponse } diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubService.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubService.kt index ab1798e..6fd867a 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubService.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubService.kt @@ -1,13 +1,12 @@ package com.sharkaboi.appupdatechecker.sources.github -import kotlinx.coroutines.Deferred import retrofit2.http.GET import retrofit2.http.Path internal interface GithubService { @GET(GithubConstants.PATH) - suspend fun getLatestReleaseAsync( + suspend fun getLatestRelease( @Path(GithubConstants.OWNER_PATH_ID) owner: String, @Path(GithubConstants.REPO_PATH_ID) repo: String, ): GithubResponse diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubTagSource.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubTagSource.kt new file mode 100644 index 0000000..e44fcc1 --- /dev/null +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/github/GithubTagSource.kt @@ -0,0 +1,42 @@ +package com.sharkaboi.appupdatechecker.sources.github + +import com.sharkaboi.appupdatechecker.models.InvalidRepositoryNameException +import com.sharkaboi.appupdatechecker.models.InvalidUserNameException +import com.sharkaboi.appupdatechecker.models.VersionDetails +import com.sharkaboi.appupdatechecker.sources.AppUpdateCheckerSource +import com.sharkaboi.appupdatechecker.versions.DefaultStringVersionComparator +import com.sharkaboi.appupdatechecker.versions.VersionComparator +import retrofit2.Retrofit +import retrofit2.converter.moshi.MoshiConverterFactory + +data class GithubTagSource( + val ownerUsername: String, + val repoName: String, + override val currentVersion: String, + override val versionComparator: VersionComparator = DefaultStringVersionComparator +) : AppUpdateCheckerSource() { + + private val service = Retrofit.Builder() + .baseUrl(GithubConstants.BASE_URL) + .addConverterFactory(MoshiConverterFactory.create()) + .build() + .create(GithubService::class.java) + + override suspend fun queryVersionDetails(): VersionDetails { + if (ownerUsername.isBlank()) { + throw InvalidUserNameException("Invalid username $ownerUsername") + } + + if (repoName.isBlank()) { + throw InvalidRepositoryNameException("Invalid repository name $repoName") + } + + val response = service.getLatestRelease(owner = ownerUsername, repo = repoName) + + return VersionDetails( + releaseNotes = response.body, + latestVersionUrl = response.htmlUrl, + latestVersion = response.tagName, + ) + } +} \ No newline at end of file diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonConstants.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonConstants.kt deleted file mode 100644 index 868ab59..0000000 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonConstants.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.sharkaboi.appupdatechecker.sources.json - -internal object JsonConstants { - const val BASE_URL = "https://google.com" -} diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonResponse.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonResponse.kt index 0dea454..cc382cf 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonResponse.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonResponse.kt @@ -5,8 +5,10 @@ import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) data class JsonResponse( - @Json(name = "latestVersion") - val latestVersion: String, + @Json(name = "latestVersionName") + val latestVersionName: String?, + @Json(name = "latestVersionCode") + val latestVersionCode: Long?, @Json(name = "latestVersionUrl") val latestVersionUrl: String, @Json(name = "releaseNotes") diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonService.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonService.kt index c57708b..32dd487 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonService.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonService.kt @@ -1,12 +1,11 @@ package com.sharkaboi.appupdatechecker.sources.json -import kotlinx.coroutines.Deferred import retrofit2.http.GET import retrofit2.http.Url internal interface JsonService { @GET - suspend fun getJsonReleaseMetaDataAsync( + suspend fun getJsonReleaseMetaData( @Url url: String ): JsonResponse } diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonSource.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonSource.kt new file mode 100644 index 0000000..d3b6d0b --- /dev/null +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/json/JsonSource.kt @@ -0,0 +1,65 @@ +package com.sharkaboi.appupdatechecker.sources.json + +import com.sharkaboi.appupdatechecker.models.InvalidEndPointException +import com.sharkaboi.appupdatechecker.models.InvalidVersionException +import com.sharkaboi.appupdatechecker.models.VersionDetails +import com.sharkaboi.appupdatechecker.sources.AppUpdateCheckerSource +import com.sharkaboi.appupdatechecker.versions.DefaultStringVersionComparator +import com.sharkaboi.appupdatechecker.versions.DefaultVersionCodeComparator +import com.sharkaboi.appupdatechecker.versions.VersionComparator +import okhttp3.HttpUrl +import retrofit2.Retrofit +import retrofit2.converter.moshi.MoshiConverterFactory + + +sealed class JsonSource : AppUpdateCheckerSource() { + abstract val jsonEndpoint: String + + private val service = Retrofit.Builder() + .baseUrl("https://google.com") + .addConverterFactory(MoshiConverterFactory.create()) + .build() + .create(JsonService::class.java) + + protected suspend fun queryResponse(): JsonResponse { + if (HttpUrl.parse(jsonEndpoint) == null) { + throw InvalidEndPointException("Invalid endpoint $jsonEndpoint") + } + + return service.getJsonReleaseMetaData(url = jsonEndpoint) + } +} + +data class JsonVersionNameSource( + override val jsonEndpoint: String, + override val currentVersion: String, + override val versionComparator: VersionComparator = DefaultStringVersionComparator +) : JsonSource() { + override suspend fun queryVersionDetails(): VersionDetails { + val response = queryResponse() + val latestVersion = response.latestVersionName + ?: throw InvalidVersionException("Version name was not found or null in response") + return VersionDetails( + releaseNotes = response.releaseNotes, + latestVersionUrl = response.latestVersionUrl, + latestVersion = latestVersion, + ) + } +} + +data class JsonVersionCodeSource( + override val jsonEndpoint: String, + override val currentVersion: Long, + override val versionComparator: VersionComparator = DefaultVersionCodeComparator +) : JsonSource() { + override suspend fun queryVersionDetails(): VersionDetails { + val response = queryResponse() + val latestVersion = response.latestVersionCode + ?: throw InvalidVersionException("Version code was not found or null in response") + return VersionDetails( + releaseNotes = response.releaseNotes, + latestVersionUrl = response.latestVersionUrl, + latestVersion = latestVersion, + ) + } +} \ No newline at end of file diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLResponse.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLResponse.kt index 675bebc..9b2cad3 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLResponse.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLResponse.kt @@ -5,9 +5,12 @@ import org.simpleframework.xml.Root @Root(name = "version") data class XMLResponse( - @field:Element(name = "latestVersion") - @param:Element(name = "latestVersion") - val latestVersion: String, + @field:Element(name = "latestVersionName", required = false) + @param:Element(name = "latestVersionName", required = false) + val latestVersionName: String?, + @field:Element(name = "latestVersionCode", required = false) + @param:Element(name = "latestVersionCode", required = false) + val latestVersionCode: Long?, @field:Element(name = "latestVersionUrl") @param:Element(name = "latestVersionUrl") val latestVersionUrl: String, diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLService.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLService.kt index 09930da..fa6102e 100644 --- a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLService.kt +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLService.kt @@ -1,12 +1,11 @@ package com.sharkaboi.appupdatechecker.sources.xml -import kotlinx.coroutines.Deferred import retrofit2.http.GET import retrofit2.http.Url interface XMLService { @GET - suspend fun getXMLReleaseMetaDataAsync( + suspend fun getXMLReleaseMetaData( @Url url: String ): XMLResponse } diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLSource.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLSource.kt new file mode 100644 index 0000000..fca1a7b --- /dev/null +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/sources/xml/XMLSource.kt @@ -0,0 +1,65 @@ +package com.sharkaboi.appupdatechecker.sources.xml + +import com.sharkaboi.appupdatechecker.models.InvalidEndPointException +import com.sharkaboi.appupdatechecker.models.InvalidVersionException +import com.sharkaboi.appupdatechecker.models.VersionDetails +import com.sharkaboi.appupdatechecker.sources.AppUpdateCheckerSource +import com.sharkaboi.appupdatechecker.versions.DefaultStringVersionComparator +import com.sharkaboi.appupdatechecker.versions.DefaultVersionCodeComparator +import com.sharkaboi.appupdatechecker.versions.VersionComparator +import okhttp3.HttpUrl +import retrofit2.Retrofit +import retrofit2.converter.simplexml.SimpleXmlConverterFactory + +sealed class XMLSource : AppUpdateCheckerSource() { + abstract val xmlEndpoint: String + + private val service = Retrofit.Builder() + .baseUrl("https://google.com") + .addConverterFactory(SimpleXmlConverterFactory.create()) + .build() + .create(XMLService::class.java) + + protected suspend fun queryResponse(): XMLResponse { + if (HttpUrl.parse(xmlEndpoint) == null) { + throw InvalidEndPointException("Invalid endpoint $xmlEndpoint") + } + + return service.getXMLReleaseMetaData(url = xmlEndpoint) + } +} + +data class XMLVersionNameSource( + override val xmlEndpoint: String, + override val currentVersion: String, + override val versionComparator: VersionComparator = DefaultStringVersionComparator +) : XMLSource() { + override suspend fun queryVersionDetails(): VersionDetails { + val response = queryResponse() + val latestVersion = response.latestVersionName + ?: throw InvalidVersionException("Version name was not found or null in response") + return VersionDetails( + releaseNotes = response.releaseNotes, + latestVersionUrl = response.latestVersionUrl, + latestVersion = latestVersion, + ) + } +} + +data class XMLVersionCodeSource( + override val xmlEndpoint: String, + override val currentVersion: Long, + override val versionComparator: VersionComparator = DefaultVersionCodeComparator +) : XMLSource() { + override suspend fun queryVersionDetails(): VersionDetails { + val response = queryResponse() + val latestVersion = response.latestVersionCode + ?: throw InvalidVersionException("Version code was not found or null in response") + return VersionDetails( + releaseNotes = response.releaseNotes, + latestVersionUrl = response.latestVersionUrl, + latestVersion = latestVersion, + ) + } +} + diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/versions/DefaultStringVersionComparator.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/versions/DefaultStringVersionComparator.kt new file mode 100644 index 0000000..fbec33a --- /dev/null +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/versions/DefaultStringVersionComparator.kt @@ -0,0 +1,39 @@ +package com.sharkaboi.appupdatechecker.versions + +import com.sharkaboi.appupdatechecker.models.InvalidVersionException +import kotlin.math.max + +object DefaultStringVersionComparator : VersionComparator { + override fun isNewerVersion(currentVersion: String, newVersion: String): Boolean { + val currentVersionSubParts = parseVersion(currentVersion) + val newVersionSubParts = parseVersion(newVersion) + val length = max(currentVersionSubParts.size, newVersionSubParts.size) + + val paddedCurrentVersionParts = padUntil(currentVersionSubParts, length) + val paddedNewVersionParts = padUntil(newVersionSubParts, length) + + if (paddedCurrentVersionParts == paddedNewVersionParts) return false + + for (i in 0 until length) { + val newVersionPart = paddedNewVersionParts[i] + val currentVersionPart = paddedCurrentVersionParts[i] + if (newVersionPart == currentVersionPart) continue + + return newVersionPart > currentVersionPart + } + + return false + } + + private fun padUntil(list: List, length: Int): List { + return list + List(length - list.size) { 0L } + } + + private fun parseVersion(version: String): List { + return version + .trimStart('v', 'V', ' ') + .trimEnd(' ') + .split('.') + .map { it.toLongOrNull() ?: throw InvalidVersionException("Invalid version $version") } + } +} \ No newline at end of file diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/versions/DefaultVersionCodeComparator.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/versions/DefaultVersionCodeComparator.kt new file mode 100644 index 0000000..1a995b6 --- /dev/null +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/versions/DefaultVersionCodeComparator.kt @@ -0,0 +1,13 @@ +package com.sharkaboi.appupdatechecker.versions + +import com.sharkaboi.appupdatechecker.models.InvalidVersionException + +object DefaultVersionCodeComparator : VersionComparator { + override fun isNewerVersion(currentVersion: Long, newVersion: Long): Boolean { + if (currentVersion < 0) throw InvalidVersionException("Invalid current version $currentVersion") + + if (newVersion < 0) throw InvalidVersionException("Invalid new version $newVersion") + + return newVersion > currentVersion + } +} \ No newline at end of file diff --git a/library/src/main/java/com/sharkaboi/appupdatechecker/versions/VersionComparator.kt b/library/src/main/java/com/sharkaboi/appupdatechecker/versions/VersionComparator.kt new file mode 100644 index 0000000..a805b44 --- /dev/null +++ b/library/src/main/java/com/sharkaboi/appupdatechecker/versions/VersionComparator.kt @@ -0,0 +1,9 @@ +package com.sharkaboi.appupdatechecker.versions + +import com.sharkaboi.appupdatechecker.models.InvalidVersionException + +interface VersionComparator { + + @Throws(InvalidVersionException::class) + fun isNewerVersion(currentVersion: T, newVersion: T): Boolean +} \ No newline at end of file diff --git a/library/src/test/java/com/github/sharkaboi/appupdatechecker/AppUpdateCheckerTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/AppUpdateCheckerTest.kt deleted file mode 100644 index e6fac3c..0000000 --- a/library/src/test/java/com/github/sharkaboi/appupdatechecker/AppUpdateCheckerTest.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.github.sharkaboi.appupdatechecker - -import android.content.Context -import com.sharkaboi.appupdatechecker.AppUpdateChecker -import com.sharkaboi.appupdatechecker.extensions.isInternetConnected -import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource -import com.sharkaboi.appupdatechecker.models.UpdateState -import io.mockk.every -import io.mockk.mockk -import io.mockk.mockkStatic -import kotlinx.coroutines.runBlocking -import org.junit.Before -import org.junit.Test - -class AppUpdateCheckerTest { - private lateinit var context: Context - - @Before - fun init() { - context = mockk(relaxed = true) - mockkStatic("com.sharkaboi.appupdatechecker.extensions.ContextExtensionsKt") - } - - @Test - fun `Checker on invalid current version tag returns generic error`() = runBlocking { - every { context.isInternetConnected } returns true - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.GithubSource( - ownerUsername = "Sharkaboi", - repoName = "MediaHub" - ), - currentVersionTag = "vdasd.ada.adas.jj" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.GenericError) - } - - @Test - fun `Checker on no internet returns network error`() = runBlocking { - every { context.isInternetConnected } returns false - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.GithubSource( - ownerUsername = "Sharkaboi", - repoName = "MediaHub" - ), - currentVersionTag = "v1.1" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.NoNetworkFound) - } -} diff --git a/library/src/test/java/com/github/sharkaboi/appupdatechecker/ExceptionsTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/ExceptionsTest.kt new file mode 100644 index 0000000..02449b9 --- /dev/null +++ b/library/src/test/java/com/github/sharkaboi/appupdatechecker/ExceptionsTest.kt @@ -0,0 +1,4 @@ +package com.github.sharkaboi.appupdatechecker + +class ExceptionsTest { +} diff --git a/library/src/test/java/com/github/sharkaboi/appupdatechecker/FDroidTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/FDroidTest.kt new file mode 100644 index 0000000..02914ea --- /dev/null +++ b/library/src/test/java/com/github/sharkaboi/appupdatechecker/FDroidTest.kt @@ -0,0 +1,110 @@ +package com.github.sharkaboi.appupdatechecker + +import com.sharkaboi.appupdatechecker.AppUpdateChecker +import com.sharkaboi.appupdatechecker.models.InvalidPackageNameException +import com.sharkaboi.appupdatechecker.models.UpdateResult +import com.sharkaboi.appupdatechecker.sources.fdroid.FDroidVersionCodeSource +import com.sharkaboi.appupdatechecker.sources.fdroid.FDroidVersionNameSource +import kotlinx.coroutines.runBlocking +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class FDroidTest { + + private val packageName = "org.fdroid.fdroid" + + @Test + fun `Checker on older installed version returns new version`() = runBlocking { + val versionNameChecker = AppUpdateChecker( + source = FDroidVersionNameSource( + packageName = packageName, + currentVersion = "v0.0.0" + ) + ) + val versionNameResult = versionNameChecker.checkUpdate() + println(versionNameResult) + assert(versionNameResult is UpdateResult.UpdateAvailable<*>) + + val versionCodeChecker = AppUpdateChecker( + source = FDroidVersionCodeSource( + packageName = packageName, + currentVersion = 0 + ) + ) + val versionCodeResult = versionCodeChecker.checkUpdate() + println(versionCodeResult) + assert(versionCodeResult is UpdateResult.UpdateAvailable<*>) + } + + @Test + fun `Checker on newer installed version returns no update`() = runBlocking { + val versionNameChecker = AppUpdateChecker( + source = FDroidVersionNameSource( + packageName = packageName, + currentVersion = "v${Long.MAX_VALUE}.0.0" + ) + ) + val versionNameResult = versionNameChecker.checkUpdate() + println(versionNameResult) + assert(versionNameResult is UpdateResult.NoUpdate) + + val versionCodeChecker = AppUpdateChecker( + source = FDroidVersionCodeSource( + packageName = packageName, + currentVersion = Long.MAX_VALUE + ) + ) + val versionCodeResult = versionCodeChecker.checkUpdate() + println(versionCodeResult) + assert(versionCodeResult is UpdateResult.NoUpdate) + } + + @Test + fun `Checker on invalid fdroid package name returns invalid error`() = runBlocking { + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = FDroidVersionCodeSource( + packageName = "invalid.app.package.name.fdroid", + currentVersion = 0 + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertNotNull(exception) + } + + @Test + fun `Checker on blank package name returns malformed error`() = runBlocking { + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = FDroidVersionCodeSource( + packageName = " ", + currentVersion = 0 + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertTrue(exception is InvalidPackageNameException) + } + + @Test + fun `Checker on repo name without dot returns malformed error`() = runBlocking { + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = FDroidVersionCodeSource( + packageName = "comsimplemobiletoolsgallerypro", + currentVersion = 0 + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertNotNull(exception) + } +} diff --git a/library/src/test/java/com/github/sharkaboi/appupdatechecker/FdroidTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/FdroidTest.kt deleted file mode 100644 index 38123cb..0000000 --- a/library/src/test/java/com/github/sharkaboi/appupdatechecker/FdroidTest.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.github.sharkaboi.appupdatechecker - -import android.content.Context -import com.sharkaboi.appupdatechecker.AppUpdateChecker -import com.sharkaboi.appupdatechecker.extensions.isInternetConnected -import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource -import com.sharkaboi.appupdatechecker.models.UpdateState -import io.mockk.every -import io.mockk.mockk -import io.mockk.mockkStatic -import kotlinx.coroutines.runBlocking -import org.junit.Before -import org.junit.Test - -class FdroidTest { - private lateinit var context: Context - - @Before - fun init() { - context = mockk(relaxed = true) - mockkStatic("com.sharkaboi.appupdatechecker.extensions.ContextExtensionsKt") - every { context.isInternetConnected } returns true - every { context.packageName } returns "org.fdroid.fdroid" - } - - @Test - fun `Checker on older installed version returns new version`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.FDroidSource(), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.UpdateAvailable) - } - - @Test - fun `Checker on newer installed version returns no update`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.FDroidSource(), - currentVersionTag = "v${Int.MAX_VALUE}.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.LatestVersionInstalled) - } - - @Test - fun `Checker on invalid fdroid package name returns invalid error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.FDroidSource( - packageName = "invalid.app.package.name.fdroid", - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.FDroidInvalid) - } - - @Test - fun `Checker on blank package name returns malformed error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.FDroidSource( - packageName = " " - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.FDroidMalformed) - } - - @Test - fun `Checker on repo name without dot returns malformed error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.FDroidSource( - packageName = "comsimplemobiletoolsgallerypro" - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.FDroidMalformed) - } -} diff --git a/library/src/test/java/com/github/sharkaboi/appupdatechecker/GithubTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/GithubTest.kt index 1bad6b9..59da0f5 100644 --- a/library/src/test/java/com/github/sharkaboi/appupdatechecker/GithubTest.kt +++ b/library/src/test/java/com/github/sharkaboi/appupdatechecker/GithubTest.kt @@ -1,129 +1,129 @@ package com.github.sharkaboi.appupdatechecker -import android.content.Context import com.sharkaboi.appupdatechecker.AppUpdateChecker -import com.sharkaboi.appupdatechecker.extensions.isInternetConnected -import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource -import com.sharkaboi.appupdatechecker.models.UpdateState -import io.mockk.every -import io.mockk.mockk -import io.mockk.mockkStatic +import com.sharkaboi.appupdatechecker.models.InvalidRepositoryNameException +import com.sharkaboi.appupdatechecker.models.InvalidUserNameException +import com.sharkaboi.appupdatechecker.models.UpdateResult +import com.sharkaboi.appupdatechecker.sources.github.GithubTagSource import kotlinx.coroutines.runBlocking -import org.junit.Before +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertTrue import org.junit.Test class GithubTest { - private lateinit var context: Context - - @Before - fun init() { - context = mockk(relaxed = true) - mockkStatic("com.sharkaboi.appupdatechecker.extensions.ContextExtensionsKt") - every { context.isInternetConnected } returns true - } + private val ownerUsername = "Sharkaboi" + private val repoName = "MediaHub" @Test fun `Checker on older installed version returns new version`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.GithubSource( - ownerUsername = "Sharkaboi", - repoName = "MediaHub" - ), - currentVersionTag = "v0.0.0" + val versionNameChecker = AppUpdateChecker( + source = GithubTagSource( + ownerUsername = ownerUsername, + repoName = repoName, + currentVersion = "v0.0.0" + ) ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.UpdateAvailable) + val versionNameResult = versionNameChecker.checkUpdate() + println(versionNameResult) + assert(versionNameResult is UpdateResult.UpdateAvailable<*>) } @Test fun `Checker on newer installed version returns no update`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.GithubSource( - ownerUsername = "Sharkaboi", - repoName = "MediaHub" - ), - currentVersionTag = "v${Int.MAX_VALUE}.0.0" + val versionNameChecker = AppUpdateChecker( + source = GithubTagSource( + ownerUsername = ownerUsername, + repoName = repoName, + currentVersion = "v${Long.MAX_VALUE}.0.0" + ) ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.LatestVersionInstalled) + val versionNameResult = versionNameChecker.checkUpdate() + println(versionNameResult) + assert(versionNameResult is UpdateResult.NoUpdate) } @Test fun `Checker on invalid github repo returns invalid error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.GithubSource( - ownerUsername = "Sharkaboi", - repoName = "adadadadadadadadaadada" - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.GithubInvalid) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = GithubTagSource( + ownerUsername = "Sharkaboi", + repoName = "adadadadadadadadaadada", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertNotNull(exception) } @Test fun `Checker on invalid github user returns invalid error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.GithubSource( - ownerUsername = "adadadadadadadadaadada", - repoName = "MediaHub" - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.GithubInvalid) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = GithubTagSource( + ownerUsername = "adadadadadadadadaadada", + repoName = "MediaHub", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertNotNull(exception) } @Test fun `Checker on github with no release returns invalid error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.GithubSource( - ownerUsername = "Sharkaboi", - repoName = "sharkaboi.github.io" - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.GithubInvalid) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = GithubTagSource( + ownerUsername = "Sharkaboi", + repoName = "sharkaboi.github.io", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertNotNull(exception) } @Test fun `Checker on blank username returns malformed error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.GithubSource( - ownerUsername = " ", - repoName = "sharkaboi.github.io" - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.GithubMalformed) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = GithubTagSource( + ownerUsername = " ", + repoName = "sharkaboi.github.io", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertTrue(exception is InvalidUserNameException) } @Test fun `Checker on empty repo name returns malformed error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.GithubSource( - ownerUsername = "Sharkaboi", - repoName = "" - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.GithubMalformed) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = GithubTagSource( + ownerUsername = "Sharkaboi", + repoName = "", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertTrue(exception is InvalidRepositoryNameException) } } diff --git a/library/src/test/java/com/github/sharkaboi/appupdatechecker/JsonTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/JsonTest.kt index 33f2618..0bf4e3c 100644 --- a/library/src/test/java/com/github/sharkaboi/appupdatechecker/JsonTest.kt +++ b/library/src/test/java/com/github/sharkaboi/appupdatechecker/JsonTest.kt @@ -1,108 +1,127 @@ package com.github.sharkaboi.appupdatechecker -import android.content.Context import com.sharkaboi.appupdatechecker.AppUpdateChecker -import com.sharkaboi.appupdatechecker.extensions.isInternetConnected -import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource -import com.sharkaboi.appupdatechecker.models.UpdateState -import io.mockk.every -import io.mockk.mockk -import io.mockk.mockkStatic +import com.sharkaboi.appupdatechecker.models.InvalidEndPointException +import com.sharkaboi.appupdatechecker.models.UpdateResult +import com.sharkaboi.appupdatechecker.sources.json.JsonVersionCodeSource +import com.sharkaboi.appupdatechecker.sources.json.JsonVersionNameSource import kotlinx.coroutines.runBlocking -import org.junit.Before +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertTrue import org.junit.Test class JsonTest { - private lateinit var context: Context - - @Before - fun init() { - context = mockk(relaxed = true) - mockkStatic("com.sharkaboi.appupdatechecker.extensions.ContextExtensionsKt") - every { context.isInternetConnected } returns true - } + private val jsonEndpoint = + "https://gist.githubusercontent.com/Sharkaboi/66b45a22afde23a9b2781eeec6f10c56/raw/3b168fc906490cc7f3cf0fc2b843461abf52422e/test.json" @Test fun `Checker on older installed version returns new version`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.JsonSource( - jsonEndpoint = "https://gist.githubusercontent.com/Sharkaboi/66b45a22afde23a9b2781eeec6f10c56/raw/e0efd6ebdaf88615945fc8c7727a7fc620ad61bf/test.json" - ), - currentVersionTag = "v0.0.0" + val versionNameChecker = AppUpdateChecker( + source = JsonVersionNameSource( + jsonEndpoint = jsonEndpoint, + currentVersion = "v0.0.0" + ) + ) + val versionNameResult = versionNameChecker.checkUpdate() + println(versionNameResult) + assert(versionNameResult is UpdateResult.UpdateAvailable<*>) + + val versionCodeChecker = AppUpdateChecker( + source = JsonVersionCodeSource( + jsonEndpoint = jsonEndpoint, + currentVersion = 0 + ) ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.UpdateAvailable) + val versionCodeResult = versionCodeChecker.checkUpdate() + println(versionCodeResult) + assert(versionCodeResult is UpdateResult.UpdateAvailable<*>) } @Test fun `Checker on newer installed version returns no update`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.JsonSource( - jsonEndpoint = "https://gist.githubusercontent.com/Sharkaboi/66b45a22afde23a9b2781eeec6f10c56/raw/e0efd6ebdaf88615945fc8c7727a7fc620ad61bf/test.json" - ), - currentVersionTag = "v${Int.MAX_VALUE}.0.0" + val versionNameChecker = AppUpdateChecker( + source = JsonVersionNameSource( + jsonEndpoint = jsonEndpoint, + currentVersion = "v${Long.MAX_VALUE}.0.0" + ) + ) + val versionNameResult = versionNameChecker.checkUpdate() + println(versionNameResult) + assert(versionNameResult is UpdateResult.NoUpdate) + + val versionCodeChecker = AppUpdateChecker( + source = JsonVersionCodeSource( + jsonEndpoint = jsonEndpoint, + currentVersion = Long.MAX_VALUE + ) ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.LatestVersionInstalled) + val versionCodeResult = versionCodeChecker.checkUpdate() + println(versionCodeResult) + assert(versionCodeResult is UpdateResult.NoUpdate) } + @Test fun `Checker on invalid json repo returns invalid error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.JsonSource( - jsonEndpoint = "https://google.com" - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.JSONInvalid) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = JsonVersionNameSource( + jsonEndpoint = "https://google.com", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertNotNull(exception) } @Test fun `Checker on invalid json schema returns invalid error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.JsonSource( - jsonEndpoint = "https://gist.githubusercontent.com/Sharkaboi/66b45a22afde23a9b2781eeec6f10c56/raw/a3998cc1728cd42ba02b5b9789f505de42090c84/invalid.json" - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.JSONInvalid) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = JsonVersionNameSource( + jsonEndpoint = "https://gist.github.com/Sharkaboi/66b45a22afde23a9b2781eeec6f10c56/raw/3b168fc906490cc7f3cf0fc2b843461abf52422e/invalid.json", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertNotNull(exception) } @Test fun `Checker on invalid url returns malformed error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.JsonSource( - jsonEndpoint = "invalid url" - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.JSONMalformed) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = JsonVersionNameSource( + jsonEndpoint = "invalid url", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertTrue(exception is InvalidEndPointException) } @Test fun `Checker on blank endpoint returns malformed error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.JsonSource( - jsonEndpoint = " " - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.JSONMalformed) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = JsonVersionNameSource( + jsonEndpoint = " ", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertTrue(exception is InvalidEndPointException) } } diff --git a/library/src/test/java/com/github/sharkaboi/appupdatechecker/VersionComparatorTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/VersionComparatorTest.kt new file mode 100644 index 0000000..d67c5a0 --- /dev/null +++ b/library/src/test/java/com/github/sharkaboi/appupdatechecker/VersionComparatorTest.kt @@ -0,0 +1,100 @@ +package com.github.sharkaboi.appupdatechecker + +import com.sharkaboi.appupdatechecker.AppUpdateChecker +import com.sharkaboi.appupdatechecker.models.InvalidVersionException +import com.sharkaboi.appupdatechecker.sources.fdroid.FDroidVersionCodeSource +import com.sharkaboi.appupdatechecker.sources.github.GithubTagSource +import kotlinx.coroutines.runBlocking +import org.junit.Test + +class VersionComparatorTest { + + @Test + fun `Checker on invalid current version name returns invalid version name error`() = + runBlocking { + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = GithubTagSource( + ownerUsername = "Sharkaboi", + repoName = "MediaHub", + currentVersion = "vdasd.ada.adas.jj" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assert(exception is InvalidVersionException) + } + + @Test + fun `Checker on invalid current version name ending returns invalid version name error`() = + runBlocking { + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = GithubTagSource( + ownerUsername = "Sharkaboi", + repoName = "MediaHub", + currentVersion = "1." + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assert(exception is InvalidVersionException) + } + + @Test + fun `Checker on invalid current version name start returns invalid version name error`() = + runBlocking { + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = GithubTagSource( + ownerUsername = "Sharkaboi", + repoName = "MediaHub", + currentVersion = ".1.2" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assert(exception is InvalidVersionException) + } + + @Test + fun `Checker on invalid current version name char returns invalid version name error`() = + runBlocking { + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = GithubTagSource( + ownerUsername = "Sharkaboi", + repoName = "MediaHub", + currentVersion = "g.1.2" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assert(exception is InvalidVersionException) + } + + @Test + fun `Checker on invalid current version code returns invalid version code error`() = + runBlocking { + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = FDroidVersionCodeSource( + packageName = "org.fdroid.fdroid", + currentVersion = -5000 + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assert(exception is InvalidVersionException) + } +} \ No newline at end of file diff --git a/library/src/test/java/com/github/sharkaboi/appupdatechecker/XMLTest.kt b/library/src/test/java/com/github/sharkaboi/appupdatechecker/XMLTest.kt index 721b19d..df6c761 100644 --- a/library/src/test/java/com/github/sharkaboi/appupdatechecker/XMLTest.kt +++ b/library/src/test/java/com/github/sharkaboi/appupdatechecker/XMLTest.kt @@ -1,108 +1,126 @@ package com.github.sharkaboi.appupdatechecker -import android.content.Context import com.sharkaboi.appupdatechecker.AppUpdateChecker -import com.sharkaboi.appupdatechecker.extensions.isInternetConnected -import com.sharkaboi.appupdatechecker.models.AppUpdateCheckerSource -import com.sharkaboi.appupdatechecker.models.UpdateState -import io.mockk.every -import io.mockk.mockk -import io.mockk.mockkStatic +import com.sharkaboi.appupdatechecker.models.InvalidEndPointException +import com.sharkaboi.appupdatechecker.models.UpdateResult +import com.sharkaboi.appupdatechecker.sources.xml.XMLVersionCodeSource +import com.sharkaboi.appupdatechecker.sources.xml.XMLVersionNameSource import kotlinx.coroutines.runBlocking -import org.junit.Before +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertTrue import org.junit.Test class XMLTest { - private lateinit var context: Context - - @Before - fun init() { - context = mockk(relaxed = true) - mockkStatic("com.sharkaboi.appupdatechecker.extensions.ContextExtensionsKt") - every { context.isInternetConnected } returns true - } + private val xmlEndpoint = + "https://gist.github.com/Sharkaboi/66b45a22afde23a9b2781eeec6f10c56/raw/3b168fc906490cc7f3cf0fc2b843461abf52422e/test.xml" @Test fun `Checker on older installed version returns new version`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.XMLSource( - xmlEndpoint = "https://gist.githubusercontent.com/Sharkaboi/66b45a22afde23a9b2781eeec6f10c56/raw/132296a0e85d254cd982959bc8f198ca61c213b7/test.xml" - ), - currentVersionTag = "v0.0.0" + val versionNameChecker = AppUpdateChecker( + source = XMLVersionNameSource( + xmlEndpoint = xmlEndpoint, + currentVersion = "v0.0.0" + ) ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.UpdateAvailable) + val versionNameResult = versionNameChecker.checkUpdate() + println(versionNameResult) + assert(versionNameResult is UpdateResult.UpdateAvailable<*>) + + val versionCodeChecker = AppUpdateChecker( + source = XMLVersionCodeSource( + xmlEndpoint = xmlEndpoint, + currentVersion = 0 + ) + ) + val versionCodeResult = versionCodeChecker.checkUpdate() + println(versionCodeResult) + assert(versionCodeResult is UpdateResult.UpdateAvailable<*>) } @Test fun `Checker on newer installed version returns no update`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.XMLSource( - xmlEndpoint = "https://gist.githubusercontent.com/Sharkaboi/66b45a22afde23a9b2781eeec6f10c56/raw/132296a0e85d254cd982959bc8f198ca61c213b7/test.xml" - ), - currentVersionTag = "v${Int.MAX_VALUE}.0.0" + val versionNameChecker = AppUpdateChecker( + source = XMLVersionNameSource( + xmlEndpoint = xmlEndpoint, + currentVersion = "v${Long.MAX_VALUE}.0.0" + ) + ) + val versionNameResult = versionNameChecker.checkUpdate() + println(versionNameResult) + assert(versionNameResult is UpdateResult.NoUpdate) + + val versionCodeChecker = AppUpdateChecker( + source = XMLVersionCodeSource( + xmlEndpoint = xmlEndpoint, + currentVersion = Long.MAX_VALUE + ) ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.LatestVersionInstalled) + val versionCodeResult = versionCodeChecker.checkUpdate() + println(versionCodeResult) + assert(versionCodeResult is UpdateResult.NoUpdate) } @Test fun `Checker on invalid xml repo returns invalid error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.XMLSource( - xmlEndpoint = "https://google.com" - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.XMLInvalid) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = XMLVersionNameSource( + xmlEndpoint = "https://google.com", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertNotNull(exception) } @Test fun `Checker on invalid xml schema returns invalid error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.XMLSource( - xmlEndpoint = "https://gist.githubusercontent.com/Sharkaboi/66b45a22afde23a9b2781eeec6f10c56/raw/132296a0e85d254cd982959bc8f198ca61c213b7/invalid.xml" - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.XMLInvalid) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = XMLVersionNameSource( + xmlEndpoint = "https://gist.github.com/Sharkaboi/66b45a22afde23a9b2781eeec6f10c56/raw/3b168fc906490cc7f3cf0fc2b843461abf52422e/invalid.xml", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertNotNull(exception) } @Test fun `Checker on invalid url returns malformed error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.XMLSource( - xmlEndpoint = "invalid url" - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.XMLMalformed) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = XMLVersionNameSource( + xmlEndpoint = "invalid url", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertTrue(exception is InvalidEndPointException) } @Test fun `Checker on blank endpoint returns malformed error`() = runBlocking { - val testChecker = AppUpdateChecker( - context, - source = AppUpdateCheckerSource.XMLSource( - xmlEndpoint = " " - ), - currentVersionTag = "v0.0.0" - ) - val result = testChecker.checkUpdate() - println(result) - assert(result is UpdateState.XMLMalformed) + val exception = runCatching { + val testChecker = AppUpdateChecker( + source = XMLVersionNameSource( + xmlEndpoint = " ", + currentVersion = "v0.0.0" + ) + ) + val result = testChecker.checkUpdate() + println(result) + }.exceptionOrNull() + println(exception) + assertTrue(exception is InvalidEndPointException) } } From eb5418b004c2e35b8413fcb99bf2af498ef8899c Mon Sep 17 00:00:00 2001 From: Sharkaboi Date: Sun, 24 Mar 2024 02:41:08 +0530 Subject: [PATCH 06/30] Add sample --- sample/.gitignore | 1 + sample/build.gradle | 49 +++++ sample/proguard-rules.pro | 21 +++ sample/src/main/AndroidManifest.xml | 22 +++ .../appupdatechecker/sample/MainActivity.kt | 44 +++++ .../drawable-v24/ic_launcher_foreground.xml | 30 ++++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++++ sample/src/main/res/layout/activity_main.xml | 23 +++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes sample/src/main/res/values-night/themes.xml | 7 + sample/src/main/res/values/colors.xml | 5 + sample/src/main/res/values/strings.xml | 3 + sample/src/main/res/values/themes.xml | 9 + settings.gradle | 1 + 25 files changed, 397 insertions(+) create mode 100644 sample/.gitignore create mode 100644 sample/build.gradle create mode 100644 sample/proguard-rules.pro create mode 100644 sample/src/main/AndroidManifest.xml create mode 100644 sample/src/main/java/com/github/sharkaboi/appupdatechecker/sample/MainActivity.kt create mode 100644 sample/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 sample/src/main/res/drawable/ic_launcher_background.xml create mode 100644 sample/src/main/res/layout/activity_main.xml create mode 100644 sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 sample/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 sample/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 sample/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 sample/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 sample/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 sample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 sample/src/main/res/values-night/themes.xml create mode 100644 sample/src/main/res/values/colors.xml create mode 100644 sample/src/main/res/values/strings.xml create mode 100644 sample/src/main/res/values/themes.xml diff --git a/sample/.gitignore b/sample/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/sample/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle new file mode 100644 index 0000000..566057f --- /dev/null +++ b/sample/build.gradle @@ -0,0 +1,49 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'com.github.sharkaboi.appupdatechecker.sample' + compileSdk 34 + + defaultConfig { + applicationId "com.github.sharkaboi.appupdatechecker.sample" + minSdk 21 + targetSdk 34 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.debug + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = '17' + } + buildFeatures { + viewBinding true + } +} + +dependencies { + implementation(project(":library")) + + implementation 'androidx.core:core-ktx:1.12.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.11.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' +} \ No newline at end of file diff --git a/sample/proguard-rules.pro b/sample/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/sample/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml new file mode 100644 index 0000000..3503454 --- /dev/null +++ b/sample/src/main/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sample/src/main/java/com/github/sharkaboi/appupdatechecker/sample/MainActivity.kt b/sample/src/main/java/com/github/sharkaboi/appupdatechecker/sample/MainActivity.kt new file mode 100644 index 0000000..84a6a66 --- /dev/null +++ b/sample/src/main/java/com/github/sharkaboi/appupdatechecker/sample/MainActivity.kt @@ -0,0 +1,44 @@ +package com.github.sharkaboi.appupdatechecker.sample + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.lifecycle.lifecycleScope +import com.github.sharkaboi.appupdatechecker.sample.databinding.ActivityMainBinding +import com.sharkaboi.appupdatechecker.AppUpdateChecker +import com.sharkaboi.appupdatechecker.models.UpdateResult +import com.sharkaboi.appupdatechecker.sources.github.GithubTagSource +import kotlinx.coroutines.CoroutineExceptionHandler +import kotlinx.coroutines.launch + +class MainActivity : AppCompatActivity() { + private lateinit var binding: ActivityMainBinding + private val errorHandler = CoroutineExceptionHandler { _, throwable -> + binding.tvUpdateDetails.text = + "Error occurred when checking for updates:\n${throwable.message}" + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityMainBinding.inflate(layoutInflater) + setContentView(binding.root) + + // Ideally manage this using your DI implementation, creates a retrofit service underneath. + val updateChecker = AppUpdateChecker( + source = GithubTagSource( + ownerUsername = "Sharkaboi", + repoName = "AppUpdateChecker", + currentVersion = "v0.0.0" + ) + ) + + binding.tvUpdateDetails.text = "Checking for updates" + + lifecycleScope.launch(errorHandler) { + // Automatically switches to IO thread behind the scenes. + binding.tvUpdateDetails.text = when (val result = updateChecker.checkUpdate()) { + UpdateResult.NoUpdate -> "Checking for updates" + is UpdateResult.UpdateAvailable<*> -> "Update found : " + result.versionDetails.toString() + } + } + } +} \ No newline at end of file diff --git a/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml b/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/sample/src/main/res/drawable/ic_launcher_background.xml b/sample/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/sample/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..5a9e25c --- /dev/null +++ b/sample/src/main/res/layout/activity_main.xml @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file diff --git a/sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/sample/src/main/res/mipmap-hdpi/ic_launcher.webp b/sample/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/sample/src/main/res/mipmap-mdpi/ic_launcher.webp b/sample/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/sample/src/main/res/mipmap-xhdpi/ic_launcher.webp b/sample/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/sample/src/main/res/values-night/themes.xml b/sample/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..a22d511 --- /dev/null +++ b/sample/src/main/res/values-night/themes.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml new file mode 100644 index 0000000..c8524cd --- /dev/null +++ b/sample/src/main/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml new file mode 100644 index 0000000..82aa71e --- /dev/null +++ b/sample/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + sample + \ No newline at end of file diff --git a/sample/src/main/res/values/themes.xml b/sample/src/main/res/values/themes.xml new file mode 100644 index 0000000..a4d87e5 --- /dev/null +++ b/sample/src/main/res/values/themes.xml @@ -0,0 +1,9 @@ + + + + +