v1.6.48

affise · Nov 21, 2024 · b49caf1 · b49caf1
1 parent 2a2790f
commit b49caf1
Show file tree

Hide file tree

Showing 44 changed files with 767 additions and 304 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -52,6 +52,7 @@ jobs:
           ./gradlew :module-phone:publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon --no-parallel
           ./gradlew :module-status:publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon --no-parallel
           ./gradlew :module-subscription:publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon --no-parallel
+          ./gradlew :module-rustore:publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon --no-parallel
           ./gradlew :internal:publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon --no-parallel
 
       - name: Version Tag
@@ -168,6 +169,18 @@ jobs:
           asset_name: module-subscription-${{ steps.version_tag.outputs.VERSION }}.aar
           asset_content_type: application/aar
 
+      # Release Upload Module RuStore
+      - name: Upload Release Module RuStore AAR 🗳
+        id: upload-module-rustore-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: module-rustore/build/outputs/aar/module-rustore-release.aar
+          asset_name: module-rustore-${{ steps.version_tag.outputs.VERSION }}.aar
+          asset_content_type: application/aar
+
 #      # Release Upload Internal library
 #      - name: Upload Release Internal AAR 🗳
 #        id: upload-internal-asset

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.6.48] - 2024-11-21
+
+### Added
+
+- New module `RuStore`.
+
 ## [1.6.47] - 2024-10-21
 
 ### Fixed
@@ -163,6 +169,7 @@
 - Improve `AffiseModuleManager`
 - Update gradle for demo app.
 
+[1.6.48]: https://github.com/affise/sdk-android/compare/v1.6.47...v1.6.48
 [1.6.47]: https://github.com/affise/sdk-android/compare/v1.6.46...v1.6.47
 [1.6.46]: https://github.com/affise/sdk-android/compare/v1.6.45...v1.6.46
 [1.6.45]: https://github.com/affise/sdk-android/compare/v1.6.44...v1.6.45

diff --git a/README.md b/README.md
@@ -12,6 +12,7 @@
 | `com.affise:module-phone`        | [![module-phone](https://img.shields.io/maven-central/v/com.affise/module-phone?label=latest)](https://mvnrepository.com/artifact/com.affise/module-phone)                      |
 | `com.affise:module-status`       | [![module-status](https://img.shields.io/maven-central/v/com.affise/module-status?label=latest)](https://mvnrepository.com/artifact/com.affise/module-status)                   |
 | `com.affise:module-subscription` | [![module-subscription](https://img.shields.io/maven-central/v/com.affise/module-subscription?label=latest)](https://mvnrepository.com/artifact/com.affise/module-subscription) |
+| `com.affise:module-rustore`      | [![module-rustore](https://img.shields.io/maven-central/v/com.affise/module-rustore?label=latest)](https://mvnrepository.com/artifact/com.affise/module-rustore)                |
 
 - [Affise Attribution Android Library](#affise-attribution-android-library)
 - [Description](#description)
@@ -99,15 +100,16 @@ For kotlin build script build.gradle.kts use:
 ```kotlin
 dependencies {
   // Add Affise library 
-  implementation("com.affise:attribution:1.6.47")
+  implementation("com.affise:attribution:1.6.48")
   // Add Affise modules 
-  implementation("com.affise:module-advertising:1.6.47")
-  implementation("com.affise:module-androidid:1.6.47")
-  implementation("com.affise:module-link:1.6.47")
-  implementation("com.affise:module-network:1.6.47")
-  implementation("com.affise:module-phone:1.6.47")
-  implementation("com.affise:module-status:1.6.47")
-  implementation("com.affise:module-subscription:1.6.47")
+  implementation("com.affise:module-advertising:1.6.48")
+  implementation("com.affise:module-androidid:1.6.48")
+  implementation("com.affise:module-link:1.6.48")
+  implementation("com.affise:module-network:1.6.48")
+  implementation("com.affise:module-phone:1.6.48")
+  implementation("com.affise:module-status:1.6.48")
+  implementation("com.affise:module-subscription:1.6.48")
+  // implementation("com.affise:module-rustore:1.6.48")
   // Add install referrer
   implementation("com.android.installreferrer:installreferrer:2.2")
 }
@@ -118,25 +120,26 @@ For groovy build script build.gradle use:
 ```groovy
 dependencies {
     // Add Affise library 
-    implementation 'com.affise:attribution:1.6.47'
+    implementation 'com.affise:attribution:1.6.48'
     // Add Affise modules 
-    implementation 'com.affise:module-advertising:1.6.47'
-    implementation 'com.affise:module-androidid:1.6.47'
-    implementation 'com.affise:module-link:1.6.47'
-    implementation 'com.affise:module-network:1.6.47'
-    implementation 'com.affise:module-phone:1.6.47'
-    implementation 'com.affise:module-status:1.6.47'
-    implementation 'com.affise:module-subscription:1.6.47'
+    implementation 'com.affise:module-advertising:1.6.48'
+    implementation 'com.affise:module-androidid:1.6.48'
+    implementation 'com.affise:module-link:1.6.48'
+    implementation 'com.affise:module-network:1.6.48'
+    implementation 'com.affise:module-phone:1.6.48'
+    implementation 'com.affise:module-status:1.6.48'
+    implementation 'com.affise:module-subscription:1.6.48'
+    // implementation 'com.affise:module-rustore:1.6.48'
     // Add install referrer
     implementation 'com.android.installreferrer:installreferrer:2.2'
 }
 ```
 
 ### Integrate as file dependency
 
-Download latest Affise SDK (`attribution-1.6.47.aar`)
+Download latest Affise SDK (`attribution-1.6.48.aar`)
 from [releases page](https://github.com/affise/sdk-android/releases) and place this binary to gradle application
-module lib directory `app/libs/attribution-1.6.47.aar`
+module lib directory `app/libs/attribution-1.6.48.aar`
 
 Add library as gradle file dependency to application module build script
 Add install referrer library
@@ -147,15 +150,16 @@ For kotlin build script build.gradle.kts use:
 dependencies {
     // ...
     // Add Affise library 
-    implementation(files("libs/attribution-1.6.47.aar"))
+    implementation(files("libs/attribution-1.6.48.aar"))
     // Add Affise modules 
-    implementation(files("libs/module-advertising-1.6.47.aar"))
-    implementation(files("libs/module-androidid-1.6.47.aar"))
-    implementation(files("libs/module-link-1.6.47.aar"))
-    implementation(files("libs/module-network-1.6.47.aar"))
-    implementation(files("libs/module-phone-1.6.47.aar"))
-    implementation(files("libs/module-status-1.6.47.aar"))
-    implementation(files("libs/module-subscription-1.6.47.aar"))
+    implementation(files("libs/module-advertising-1.6.48.aar"))
+    implementation(files("libs/module-androidid-1.6.48.aar"))
+    implementation(files("libs/module-link-1.6.48.aar"))
+    implementation(files("libs/module-network-1.6.48.aar"))
+    implementation(files("libs/module-phone-1.6.48.aar"))
+    implementation(files("libs/module-status-1.6.48.aar"))
+    implementation(files("libs/module-subscription-1.6.48.aar"))
+    // implementation(files("libs/module-rustore-1.6.48.aar"))
     // Add install referrer
     implementation("com.android.installreferrer:installreferrer:2.2")
 }
@@ -167,15 +171,16 @@ For groovy build script build.gradle use:
 dependencies {
   // ...  
   // Add Affise library 
-  implementation files('libs/attribution-1.6.47.aar')
+  implementation files('libs/attribution-1.6.48.aar')
   // Add Affise modules 
-  implementation files('libs/module-advertising-1.6.47.aar')
-  implementation files('libs/module-androidid-1.6.47.aar')
-  implementation files('libs/module-link-1.6.47.aar')
-  implementation files('libs/module-network-1.6.47.aar')
-  implementation files('libs/module-phone-1.6.47.aar')
-  implementation files('libs/module-status-1.6.47.aar')
-  implementation files('libs/module-subscription-1.6.47.aar')
+  implementation files('libs/module-advertising-1.6.48.aar')
+  implementation files('libs/module-androidid-1.6.48.aar')
+  implementation files('libs/module-link-1.6.48.aar')
+  implementation files('libs/module-network-1.6.48.aar')
+  implementation files('libs/module-phone-1.6.48.aar')
+  implementation files('libs/module-status-1.6.48.aar')
+  implementation files('libs/module-subscription-1.6.48.aar')
+  // implementation files('libs/module-rustore-1.6.48.aar')
   // Add install referrer
   implementation 'com.android.installreferrer:installreferrer:2.2'
 }
@@ -279,6 +284,7 @@ class App : Application() {
 | `Phone`        | [![module-phone](https://img.shields.io/maven-central/v/com.affise/module-phone?label=latest)](https://mvnrepository.com/artifact/com.affise/module-phone)                      | `Auto` |
 | `Status`       | [![module-status](https://img.shields.io/maven-central/v/com.affise/module-status?label=latest)](https://mvnrepository.com/artifact/com.affise/module-status)                   | `Auto` |
 | `Subscription` | [![module-subscription](https://img.shields.io/maven-central/v/com.affise/module-subscription?label=latest)](https://mvnrepository.com/artifact/com.affise/module-subscription) | `Auto` |
+| `RuStore`      | [![module-rustore](https://img.shields.io/maven-central/v/com.affise/module-rustore?label=latest)](https://mvnrepository.com/artifact/com.affise/module-rustore)                | `Auto` |
 
 If module start type is `Manual`, then call:
 
@@ -1161,6 +1167,8 @@ Affise.forget() // to forget users data
 
 Use the next public method of SDK
 
+> To get Install referrer by installing from RuStore include module [`RuStore`](#modules)
+
 For kotlin:
 
 ```kotlin
@@ -1181,6 +1189,8 @@ Affise.getReferrerUrl(referrer -> {
 
 Use the next public method of SDK to get referrer parameter by
 
+> To get Install referrer by installing from RuStore include module [`RuStore`](#modules)
+
 For kotlin:
 
 ```kotlin

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
 
     defaultConfig {
         applicationId "com.affise.app"
-        minSdk 21
+        minSdk 23
         targetSdk 34
         versionCode 1
         versionName "1.0 build (${buildTime()})"
@@ -57,6 +57,7 @@ dependencies {
     implementation(project("::module-phone"))
     implementation(project("::module-status"))
     implementation(project("::module-subscription"))
+    implementation(project("::module-rustore"))
 
     implementation "com.google.firebase:firebase-messaging-ktx:$firebase"
     implementation platform("androidx.compose:compose-bom:$compose_bom")

diff --git a/attribution/src/main/java/com/affise/attribution/Affise.kt b/attribution/src/main/java/com/affise/attribution/Affise.kt
@@ -250,15 +250,15 @@ object Affise {
      */
     @JvmStatic
     fun getReferrerUrl(callback: OnReferrerCallback?) {
-        api?.retrieveInstallReferrerUseCase?.getReferrer(callback)
+        api?.storeInstallReferrerUseCase?.getReferrer(callback)
     }
 
     /**
      * Get referrer Value
      */
     @JvmStatic
     fun getReferrerUrlValue(key: ReferrerKey, callback: OnReferrerCallback?) {
-        api?.retrieveInstallReferrerUseCase?.getReferrerValue(key, callback)
+        api?.storeInstallReferrerUseCase?.getReferrerValue(key, callback)
     }
 
     /**

diff --git a/attribution/src/main/java/com/affise/attribution/AffiseApi.kt b/attribution/src/main/java/com/affise/attribution/AffiseApi.kt
@@ -6,23 +6,20 @@ import com.affise.attribution.debug.validate.DebugValidateUseCase
 import com.affise.attribution.deeplink.DeeplinkManagerImpl
 import com.affise.attribution.events.EventsManager
 import com.affise.attribution.events.StoreEventUseCase
-import com.affise.attribution.events.autoCatchingClick.AutoCatchingClickProvider
 import com.affise.attribution.init.InitPropertiesStorage
 import com.affise.attribution.init.SetPropertiesWhenAppInitializedUseCase
 import com.affise.attribution.internal.StoreInternalEventUseCase
 import com.affise.attribution.logs.LogsManager
-import com.affise.attribution.metrics.MetricsManager
 import com.affise.attribution.modules.AffiseModuleManager
 import com.affise.attribution.parameters.factory.PostBackModelFactory
 import com.affise.attribution.session.SessionManager
 import com.affise.attribution.test.CrashApplicationUseCase
-import com.affise.attribution.usecase.RetrieveInstallReferrerUseCase
 import com.affise.attribution.usecase.EraseUserDataUseCaseImpl
 import com.affise.attribution.usecase.FirstAppOpenUseCase
-import com.affise.attribution.usecase.PreferencesUseCaseImpl
 import com.affise.attribution.usecase.ImmediateSendToServerUseCase
-import com.affise.attribution.usecase.SendDataToServerUseCase
+import com.affise.attribution.usecase.PreferencesUseCaseImpl
 import com.affise.attribution.usecase.SendGDPREventUseCaseImpl
+import com.affise.attribution.usecase.StoreInstallReferrerUseCase
 import com.affise.attribution.webBridge.WebBridgeManager
 
 /**
@@ -46,7 +43,7 @@ internal interface AffiseApi {
     val sendGDPREventUseCase: SendGDPREventUseCaseImpl
 //    val metricsManager: MetricsManager
     val crashApplicationUseCase: CrashApplicationUseCase
-    val retrieveInstallReferrerUseCase: RetrieveInstallReferrerUseCase
+    val storeInstallReferrerUseCase: StoreInstallReferrerUseCase
     val moduleManager: AffiseModuleManager
     val postBackModelFactory: PostBackModelFactory
     val debugValidateUseCase: DebugValidateUseCase

diff --git a/attribution/src/main/java/com/affise/attribution/AffiseComponent.kt b/attribution/src/main/java/com/affise/attribution/AffiseComponent.kt
@@ -18,7 +18,6 @@ import com.affise.attribution.deeplink.DeeplinkClickRepositoryImpl
 import com.affise.attribution.deeplink.DeeplinkManagerImpl
 import com.affise.attribution.deeplink.InstallReferrerToDeeplinkUriConverter
 import com.affise.attribution.events.*
-import com.affise.attribution.events.autoCatchingClick.AutoCatchingClickProvider
 import com.affise.attribution.init.*
 import com.affise.attribution.internal.*
 import com.affise.attribution.logs.*
@@ -44,6 +43,7 @@ import com.affise.attribution.test.CrashApplicationUseCaseImpl
 import com.affise.attribution.usecase.*
 import com.affise.attribution.utils.ActivityActionsManager
 import com.affise.attribution.utils.ActivityActionsManagerImpl
+import com.affise.attribution.utils.SystemAppChecker
 import com.affise.attribution.webBridge.WebBridgeManager
 
 internal class AffiseComponent(
@@ -59,7 +59,7 @@ internal class AffiseComponent(
             buildConfigPropertiesProvider,
             app,
             firstAppOpenUseCase,
-            retrieveInstallReferrerUseCase,
+            storeInstallReferrerUseCase,
             sessionManager,
             sharedPreferences,
             initPropertiesStorage,
@@ -68,7 +68,8 @@ internal class AffiseComponent(
             logsManager,
             isDeeplinkClickRepository,
             deviceUseCase,
-            remarketingUseCase
+            remarketingUseCase,
+            storeUseCase
         ).create()
     }
 
@@ -339,15 +340,26 @@ internal class AffiseComponent(
     /**
      * RetrieveInstallReferrerUseCase
      */
-    override val retrieveInstallReferrerUseCase by lazy {
-        RetrieveInstallReferrerUseCase(
+    private val googleInstallReferrerUseCase by lazy {
+        GoogleInstallReferrerUseCase(
             sharedPreferences,
             AffiseReferrerDataToStringConverter(),
             StringToAffiseReferrerDataConverter(logsManager),
             app,
             deeplinkManager,
             logsManager,
-            InstallReferrerToDeeplinkUriConverter()
+            InstallReferrerToDeeplinkUriConverter(),
+        )
+    }
+
+    /**
+     * StoreInstallReferrerUseCase
+     */
+    override val storeInstallReferrerUseCase by lazy {
+        StoreInstallReferrerUseCase(
+            app,
+            storeUseCase,
+            googleInstallReferrerUseCase
         )
     }
 
@@ -389,6 +401,14 @@ internal class AffiseComponent(
         )
     }
 
+    private val storeUseCase: StoreUseCase by lazy {
+        StoreUseCaseImpl(
+            app,
+            logsManager,
+            SystemAppChecker(app)
+        )
+    }
+
     /**
      * SharedPreferences
      */
@@ -493,9 +513,6 @@ internal class AffiseComponent(
         sendGDPREventUseCase.sendForgetMeEvent()
         firstAppOpenUseCase.onAppCreated()
         sessionManager.init()
-        retrieveInstallReferrerUseCase.startInstallReferrerRetrieve(onFinished = {
-            eventsManager.init()
-        })
         setPropertiesWhenInitUseCase.init(initProperties)
         deeplinkManager.init()
 //        autoCatchingClickProvider.init(initProperties.autoCatchingClickEvents)
@@ -516,9 +533,15 @@ internal class AffiseComponent(
                 httpClient,
                 postBackModelFactory,
                 postBackModelToJsonStringConverter,
+                sharedPreferences,
             )
         )
 
+        storeInstallReferrerUseCase.onReferrerSetupFinished {
+            eventsManager.init()
+        }
+            .init(moduleManager)
+
         isReady = true
     }
 

diff --git a/attribution/src/main/java/com/affise/attribution/modules/AffiseModule.kt b/attribution/src/main/java/com/affise/attribution/modules/AffiseModule.kt
@@ -10,7 +10,9 @@ import com.affise.attribution.parameters.base.getRequestProviders
 abstract class AffiseModule {
 
     protected var application: Application? = null
+        private set
     protected var logsManager: LogsManager? = null
+        private set
     var dependencies: List<Any>? = null
         private set
     var baseProviders: List<Provider>? = null

diff --git a/attribution/src/main/java/com/affise/attribution/modules/AffiseModuleManager.kt b/attribution/src/main/java/com/affise/attribution/modules/AffiseModuleManager.kt
@@ -7,7 +7,7 @@ import com.affise.attribution.modules.exceptions.AffiseModuleError
 import com.affise.attribution.parameters.factory.PostBackModelFactory
 
 
-internal class AffiseModuleManager(
+class AffiseModuleManager(
     private val application: Application,
     private val logsManager: LogsManager,
     private val postBackModelFactory: PostBackModelFactory,

diff --git a/attribution/src/main/java/com/affise/attribution/modules/AffiseModules.kt b/attribution/src/main/java/com/affise/attribution/modules/AffiseModules.kt
@@ -8,7 +8,8 @@ enum class AffiseModules(val module: String) {
     Network("com.affise.attribution.module.network.NetworkModule"),
     Phone("com.affise.attribution.module.phone.PhoneModule"),
     Status("com.affise.attribution.module.status.StatusModule"),
-    Subscription("com.affise.attribution.module.subscription.SubscriptionModule");
+    Subscription("com.affise.attribution.module.subscription.SubscriptionModule"),
+    RuStore("com.affise.attribution.module.rustore.RuStoreModule");
 
     companion object {
         @JvmStatic