From 150ee83643601cdd1ac4e2b46d5a01fd1d8345e2 Mon Sep 17 00:00:00 2001 From: Matt Creaser Date: Wed, 6 Nov 2024 12:26:11 -0400 Subject: [PATCH 1/2] Fix RxAmplify references to categories --- .../src/main/java/com/amplifyframework/rx/RxAmplify.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rxbindings/src/main/java/com/amplifyframework/rx/RxAmplify.java b/rxbindings/src/main/java/com/amplifyframework/rx/RxAmplify.java index b475f8894..3e153e9eb 100644 --- a/rxbindings/src/main/java/com/amplifyframework/rx/RxAmplify.java +++ b/rxbindings/src/main/java/com/amplifyframework/rx/RxAmplify.java @@ -34,10 +34,10 @@ public final class RxAmplify { private RxAmplify() {} // Breaking the rules, here. Don't look. - @SuppressWarnings({"checkstyle:all"}) public static final AnalyticsCategory Analytics = new AnalyticsCategory(); + @SuppressWarnings({"checkstyle:all"}) public static final AnalyticsCategory Analytics = Amplify.Analytics; @SuppressWarnings({"checkstyle:all"}) public static final RxApiCategoryBehavior API = new RxApiBinding(); @SuppressWarnings({"checkstyle:all"}) public static final RxAuthCategoryBehavior Auth = new RxAuthBinding(); - @SuppressWarnings({"checkstyle:all"}) public static final LoggingCategory Logging = new LoggingCategory(); + @SuppressWarnings({"checkstyle:all"}) public static final LoggingCategory Logging = Amplify.Logging; @SuppressWarnings({"checkstyle:all"}) public static final RxStorageCategoryBehavior Storage = new RxStorageBinding(); @SuppressWarnings({"checkstyle:all"}) public static final RxHubCategoryBehavior Hub = new RxHubBinding(); @SuppressWarnings({"checkstyle:all"}) public static final RxDataStoreCategoryBehavior DataStore = new RxDataStoreBinding(); From 960e963972fe598c6b763c99f4ab2f9d7b548e5d Mon Sep 17 00:00:00 2001 From: Matt Creaser Date: Thu, 7 Nov 2024 12:19:37 -0400 Subject: [PATCH 2/2] Also fix Kotlin Facade --- .../src/main/java/com/amplifyframework/kotlin/core/Amplify.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core-kotlin/src/main/java/com/amplifyframework/kotlin/core/Amplify.kt b/core-kotlin/src/main/java/com/amplifyframework/kotlin/core/Amplify.kt index a1aaf94c2..fe10e4d22 100644 --- a/core-kotlin/src/main/java/com/amplifyframework/kotlin/core/Amplify.kt +++ b/core-kotlin/src/main/java/com/amplifyframework/kotlin/core/Amplify.kt @@ -41,11 +41,11 @@ import com.amplifyframework.logging.LoggingCategory @Suppress("unused") class Amplify { companion object { - val Analytics = AnalyticsCategory() + val Analytics: AnalyticsCategory = delegate.Analytics val API = KotlinApiFacade() val Auth = KotlinAuthFacade() val Geo = KotlinGeoFacade() - val Logging = LoggingCategory() + val Logging: LoggingCategory = delegate.Logging val Storage = KotlinStorageFacade() val Hub = KotlinHubFacade() val DataStore = KotlinDataStoreFacade()