Add option to build without Google dependencies

CustomVnc-app/build.gradle

@@ -20,6 +20,18 @@ android {
         }
     }
 
+    flavorDimensions += "googleDependencies"
+    productFlavors {
+        withGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withGoogle"]
+        }
+        withoutGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withoutGoogle"]
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

Opaque-app/build.gradle

@@ -20,6 +20,18 @@ android {
         }
     }
 
+    flavorDimensions += "googleDependencies"
+    productFlavors {
+        withGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withGoogle"]
+        }
+        withoutGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withoutGoogle"]
+        }
+    }
+
     sourceSets.main {
         java.srcDirs += 'src/main/java'
     }

README.md

@@ -117,6 +117,15 @@ Welcome screen, browsing to the remote-desktop-clients directory and selecting i
 
   - Build -> Make Project should now work.
 
+### Opting-out of Google dependencies
+
+To build without Google dependencies,
+
+1. Open the project in Android Studio
+2. In Android Studio menu, select Build -> Select Build Variant...
+3. In the Build Variants window, select the `withoutGoogleDebug` or `withoutGoogleRelease` variant
+for the module(s) you want to build.
+
 ## Custom Certificate Authority
 
 You can add custom CAs for aSPICE and Opaque in remoteClientLib/certificate_authorities/. They will be merged with the

aRDP-app/build.gradle

@@ -16,6 +16,18 @@ android {
         }
     }
 
+    flavorDimensions += "googleDependencies"
+    productFlavors {
+        withGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withGoogle"]
+        }
+        withoutGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withoutGoogle"]
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

aSPICE-app/build.gradle

@@ -16,6 +16,18 @@ android {
         }
     }
 
+    flavorDimensions += "googleDependencies"
+    productFlavors {
+        withGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withGoogle"]
+        }
+        withoutGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withoutGoogle"]
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

bVNC-app/build.gradle

@@ -16,6 +16,18 @@ android {
         }
     }
 
+    flavorDimensions += "googleDependencies"
+    productFlavors {
+        withGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withGoogle"]
+        }
+        withoutGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withoutGoogle"]
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

bVNC/build.gradle

@@ -17,6 +17,16 @@ android {
         }
     }
 
+    flavorDimensions += "googleDependencies"
+    productFlavors {
+        withGoogle {
+            dimension "googleDependencies"
+        }
+        withoutGoogle {
+            dimension "googleDependencies"
+        }
+    }
+
     packagingOptions {
         exclude 'lib/armeabi/libsqlcipher.so'
         exclude 'lib/mips64/libsqlcipher.so'
@@ -52,10 +62,10 @@ dependencies {
     implementation "androidx.core:core-ktx:1.7.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation 'com.google.android.play:review:2.0.1'
-    implementation 'com.google.android.play:review-ktx:2.0.1'
+    withGoogleImplementation 'com.google.android.play:review:2.0.1'
+    withGoogleImplementation 'com.google.android.play:review-ktx:2.0.1'
     implementation project(path: ':common')
-    implementation 'com.google.android.gms:play-services-base:18.0.1'
+    withGoogleImplementation 'com.google.android.gms:play-services-base:18.0.1'
 }
 repositories {
     mavenCentral()

bVNC/src/main/java/com/iiordanov/bVNC/Utils.java

@@ -51,12 +51,6 @@
 
 import com.antlersoft.android.contentxml.SqliteElement;
 import com.antlersoft.android.contentxml.SqliteElement.ReplaceStrategy;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.tasks.Task;
-import com.google.android.play.core.review.ReviewInfo;
-import com.google.android.play.core.review.ReviewManager;
-import com.google.android.play.core.review.ReviewManagerFactory;
 import com.undatech.opaque.AbstractDrawableData;
 import com.undatech.opaque.ConnectionSetupActivity;
 import com.undatech.remoteClientUi.R;
@@ -630,25 +624,6 @@ public static void startUriIntent(Context context, String url) {
         }
     }
 
-    public static void showRateAppDialog(Activity activity) {
-        ReviewManager manager = ReviewManagerFactory.create(activity);
-        Task<ReviewInfo> request = manager.requestReviewFlow();
-        request.addOnCompleteListener(task -> {
-            GoogleApiAvailability apiAvailability = GoogleApiAvailability.getInstance();
-            if (apiAvailability.isGooglePlayServicesAvailable(activity) == ConnectionResult.SUCCESS) {
-                if (task.isSuccessful()) {
-                    ReviewInfo reviewInfo = task.getResult();
-                    Task<Void> flow = manager.launchReviewFlow(activity, reviewInfo);
-                    flow.addOnCompleteListener(completedTask -> {
-                        Log.d(TAG, "rateApp: Completed: " + completedTask.getResult());
-                    });
-                } else {
-                    Log.d(TAG, "rateApp: task is not successful");
-                }
-            }
-        });
-    }
-
     public static void setClipboard(Context context, String url) {
         ClipboardManager cm = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
         cm.setText(url);

bVNC/src/main/java/com/undatech/opaque/ConnectionGridActivity.java

@@ -61,6 +61,7 @@
 import com.iiordanov.bVNC.ConnectionBean;
 import com.iiordanov.bVNC.Constants;
 import com.iiordanov.bVNC.Database;
+import com.iiordanov.bVNC.GoogleUtils;
 import com.iiordanov.bVNC.RemoteCanvasActivity;
 import com.iiordanov.bVNC.Utils;
 import com.iiordanov.bVNC.dialogs.GetTextFragment;
@@ -591,7 +592,7 @@ public void reportBug(View item) {
 
     public void rateApp(View item) {
         Log.d(TAG, "rateApp: Showing rate app functionality");
-        Utils.showRateAppDialog(this);
+        GoogleUtils.showRateAppDialog(this);
     }
 
     public void shareApp(View item) {

bVNC/src/withGoogle/java/com/iiordanov/bVNC/GoogleUtils.java

@@ -0,0 +1,34 @@
+package com.iiordanov.bVNC;
+
+import android.app.Activity;
+import android.util.Log;
+
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
+import com.google.android.gms.tasks.Task;
+import com.google.android.play.core.review.ReviewInfo;
+import com.google.android.play.core.review.ReviewManager;
+import com.google.android.play.core.review.ReviewManagerFactory;
+
+public class GoogleUtils {
+    private final static String TAG = "GoogleUtils";
+
+    public static void showRateAppDialog(Activity activity) {
+        ReviewManager manager = ReviewManagerFactory.create(activity.getApplicationContext());
+        Task<ReviewInfo> request = manager.requestReviewFlow();
+        request.addOnCompleteListener(task -> {
+            GoogleApiAvailability apiAvailability = GoogleApiAvailability.getInstance();
+            if (apiAvailability.isGooglePlayServicesAvailable(activity) == ConnectionResult.SUCCESS) {
+                if (task.isSuccessful()) {
+                    ReviewInfo reviewInfo = task.getResult();
+                    Task<Void> flow = manager.launchReviewFlow(activity, reviewInfo);
+                    flow.addOnCompleteListener(completedTask -> {
+                        Log.d(TAG, "rateApp: Completed: " + completedTask.getResult());
+                    });
+                } else {
+                    Log.d(TAG, "rateApp: task is not successful");
+                }
+            }
+        });
+    }
+}

bVNC/src/withoutGoogle/java/com/iiordanov/bVNC/GoogleUtils.java

@@ -0,0 +1,9 @@
+package com.iiordanov.bVNC;
+
+import android.app.Activity;
+
+public class GoogleUtils {
+    public static void showRateAppDialog(Activity activity) {
+
+    }
+}

freeaRDP-app/build.gradle

@@ -16,6 +16,18 @@ android {
         }
     }
 
+    flavorDimensions += "googleDependencies"
+    productFlavors {
+        withGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withGoogle"]
+        }
+        withoutGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withoutGoogle"]
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

freeaSPICE-app/build.gradle

@@ -16,6 +16,18 @@ android {
         }
     }
 
+    flavorDimensions += "googleDependencies"
+    productFlavors {
+        withGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withGoogle"]
+        }
+        withoutGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withoutGoogle"]
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

freebVNC-app/build.gradle

@@ -16,6 +16,18 @@ android {
         }
     }
 
+    flavorDimensions += "googleDependencies"
+    productFlavors {
+        withGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withGoogle"]
+        }
+        withoutGoogle {
+            dimension "googleDependencies"
+            matchingFallbacks ["withoutGoogle"]
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8