Merge remote-tracking branch 'bbigam/fork' into fork

fork-maintainers · Sep 7, 2020 · 687c000 · 687c000
2 parents 115a52b + fd0abbe
commit 687c000
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 25 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -475,9 +475,6 @@ dependencies {
     implementation Deps.lottie
 
 
-
-    implementation Deps.google_play_store // Required for in-app reviews
-
     androidTestImplementation Deps.uiautomator
 // Removed pending AndroidX fixes
     androidTestImplementation "tools.fastlane:screengrab:2.0.0"

diff --git a/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt b/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt
@@ -7,7 +7,6 @@ package org.mozilla.fenix.components
 import android.app.Activity
 import android.content.Context
 import androidx.annotation.VisibleForTesting
-import com.google.android.play.core.review.ReviewManagerFactory
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.withContext
 import org.mozilla.fenix.utils.Settings
@@ -44,17 +43,7 @@ class ReviewPromptController(
     private val context: Context,
     private val reviewSettings: ReviewSettings,
     private val timeNowInMillis: () -> Long = { System.currentTimeMillis() },
-    private val tryPromptReview: suspend (Activity) -> Unit = { activity ->
-        val manager = ReviewManagerFactory.create(context)
-        val flow = manager.requestReviewFlow()
-
-        withContext(Main) {
-            flow.addOnCompleteListener {
-                if (it.isSuccessful) {
-                    manager.launchReviewFlow(activity, it.result)
-                }
-            }
-        }
+    private val tryPromptReview: suspend (Activity) -> Unit = { _ ->
     }
 ) {
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -8,7 +8,7 @@ object Versions {
     const val android_gradle_plugin = "3.5.0"
     const val sentry = "1.7.10"
     const val leakcanary = "2.4"
-    const val leanplum = "5.4.0"
+
     const val osslicenses_plugin = "0.9.5"
     const val detekt = "1.9.1"
 
@@ -31,18 +31,13 @@ object Versions {
 
     const val mozilla_android_components = AndroidComponents.VERSION
 
-    const val adjust = "4.18.3"
-    const val installreferrer = "1.0"
 
     const val junit = "5.5.2"
     const val mockk = "1.10.0"
 
     const val mockwebserver = "3.11.0"
     const val uiautomator = "2.2.0"
 
-    const val google_ads_id_version = "16.0.0"
-
-    const val google_play_store_version = "1.8.0"
 
     const val airbnb_lottie = "3.4.0"
 }
@@ -202,10 +197,6 @@ object Deps {
     const val uiautomator = "androidx.test.uiautomator:uiautomator:${Versions.uiautomator}"
     const val robolectric = "org.robolectric:robolectric:4.3.1"
 
-    const val google_ads_id = "com.google.android.gms:play-services-ads-identifier:${Versions.google_ads_id_version}"
-
-    // Required for in-app reviews
-    const val google_play_store = "com.google.android.play:core:${Versions.google_play_store_version}"
 
     const val lottie = "com.airbnb.android:lottie:${Versions.airbnb_lottie}"