Merge pull request #29 from Baseflow/feature/make_google_play_services_available

Changed native code structure, added more functionality

Author: mvanbeusekom

.github/no-response.yml

@@ -0,0 +1,15 @@
+# Configuration for probot-no-response - https://github.com/probot/no-response
+
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 14
+
+# Label requiring a response
+responseRequiredLabel: "status: needs more info"
+
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  to our request for more information from the original author. With only the
+  information that is currently in the issue, we don't have enough information
+  to take action. Please reach out if you have or find the answers we need so
+  that we can investigate further.

.gitignore

@@ -54,6 +54,7 @@ flutter_*.png
 linked_*.ds
 unlinked.ds
 unlinked_spec.ds
+pubspec.lock
 
 # Android related
 **/android/**/gradle-wrapper.jar
@@ -96,3 +97,6 @@ unlinked_spec.ds
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+# Ignore coverage folder.
+coverage/

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 4.0.0
+
+* Changed the structure of the native code;
+* Updated the example app;
+* Added `makeGooglePlayServicesAvailable` ;
+* Added `getErrorString`;
+* Added `isUserResolvable`;
+* Added `showErrorNotification`;
+* Added extra tests for the newly added methods.
+
+## 3.0.2
+
+* Updated `pubspec.yaml` to newer versions of `SDK` and `flutter` and adding `flutter_lints` as a dependency;
+* Updated `analysis_options.yaml` for using `flutter_lints`;
+* Updated code according to the set lint rule(s);
+* Updated `compileSdkVersion` and `targetSdkVersion` in the `build.gradle`
+* Fixed bug were starting the example app would close on running for the first time by adding internet permission in the `AndroidManifest`
+
 ## 3.0.1
 
 * Added unit-tests to guard API against breaking changes.

README.md

@@ -14,7 +14,7 @@ To use this plugin, add `google_api_availability` as a [dependency in your pubsp
 
 ```yaml
 dependencies:
-  google_api_availability: ^3.0.1
+  google_api_availability: ^3.0.2
 ```
 
 > **NOTE:** There's a known issue with integrating plugins that use Swift into a Flutter project created with the Objective-C template. See issue [Flutter#16049](https://github.com/flutter/flutter/issues/16049) for help on integration.

analysis_options.yaml

@@ -1,12 +1,10 @@
-include: package:pedantic/analysis_options.yaml
+include: package:flutter_lints/flutter.yaml
 
 analyzer:
   exclude:
     # Ignore generated files
     - '**/*.g.dart'
     - 'lib/src/generated/*.dart'
-    # workaround for https://github.com/dart-lang/sdk/issues/42910
-    - 'example/**'
 linter:
   rules:
     - public_member_api_docs

android/build.gradle

@@ -4,25 +4,30 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
     }
 }
 
 rootProject.allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
     defaultConfig {
         minSdkVersion 16
@@ -34,6 +39,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.android.gms:play-services-base:17.2.1'
+    implementation 'com.google.android.gms:play-services-base:18.1.0'
     implementation 'androidx.annotation:annotation:1.1.0'
 }

android/src/main/java/com/baseflow/googleapiavailability/GoogleApiAvailabilityConstants.java

@@ -0,0 +1,59 @@
+package com.baseflow.googleapiavailability;
+
+import androidx.annotation.IntDef;
+
+import com.google.android.gms.common.ConnectionResult;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+final class GoogleApiAvailabilityConstants {
+    static final String LOG_TAG = "google_api_availability";
+
+    static final int REQUEST_GOOGLE_PLAY_SERVICES = 1000;
+
+    //GOOGLE_PLAY_SERVICES_AVAILABILITY
+    static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_SUCCESS = 0;
+    static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_MISSING = 1;
+    static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_UPDATING = 2;
+    static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_VERSION_UPDATE_REQUIRED = 3;
+    static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_DISABLED = 4;
+    static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_INVALID = 5;
+    static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_NOT_AVAILABLE_ON_PLATFORM = 6;
+    static final int GOOGLE_PLAY_SERVICES_AVAILABILITY_UNKNOWN = 7;
+
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({
+            GOOGLE_PLAY_SERVICES_AVAILABILITY_SUCCESS,
+            GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_MISSING,
+            GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_UPDATING,
+            GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_VERSION_UPDATE_REQUIRED,
+            GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_DISABLED,
+            GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_INVALID,
+            GOOGLE_PLAY_SERVICES_AVAILABILITY_NOT_AVAILABLE_ON_PLATFORM,
+            GOOGLE_PLAY_SERVICES_AVAILABILITY_UNKNOWN,
+    })
+    @interface GooglePlayServicesAvailability {
+    }
+
+    @GooglePlayServicesAvailability
+    static int toPlayServiceAvailability(int connectionResult) {
+        switch (connectionResult) {
+            case ConnectionResult.SUCCESS:
+                return GOOGLE_PLAY_SERVICES_AVAILABILITY_SUCCESS;
+            case ConnectionResult.SERVICE_MISSING:
+                return GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_MISSING;
+            case ConnectionResult.SERVICE_UPDATING:
+                return GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_UPDATING;
+            case ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED:
+                return GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_VERSION_UPDATE_REQUIRED;
+            case ConnectionResult.SERVICE_DISABLED:
+                return GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_DISABLED;
+            case ConnectionResult.SERVICE_INVALID:
+                return GOOGLE_PLAY_SERVICES_AVAILABILITY_SERVICE_INVALID;
+            default:
+                return GOOGLE_PLAY_SERVICES_AVAILABILITY_UNKNOWN;
+        }
+    }
+}

android/src/main/java/com/baseflow/googleapiavailability/GoogleApiAvailabilityManager.java

@@ -0,0 +1,149 @@
+package com.baseflow.googleapiavailability;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.app.PendingIntent;
+import android.content.Context;
+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 java.util.List;
+
+public class GoogleApiAvailabilityManager {
+
+    GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.getInstance();
+
+    @FunctionalInterface
+    interface SuccessCallback {
+        void onSuccess(int connectionResult);
+    }
+
+    @FunctionalInterface
+    interface MakeGooglePlayServicesAvailableCallback {
+        void onSuccess(Void v);
+    }
+
+    @FunctionalInterface
+    interface getErrorStringCallback {
+        void onSuccess(String errorString);
+    }
+
+    @FunctionalInterface
+    interface isUserResolvableCallback {
+        void onSuccess(boolean isUserResolvable);
+    }
+
+    @FunctionalInterface
+    interface showErrorNotificationCallback {
+        void onSuccess(Void v);
+    }
+
+    @FunctionalInterface
+    interface showErrorDialogFragmentCallback {
+        void onSuccess(boolean showErrorDialogFragmentCallback);
+    }
+
+    @FunctionalInterface
+    interface ErrorCallback {
+        void onError(String errorCode, String errorDescription);
+    }
+
+    void checkPlayServicesAvailability(Boolean showDialog, Activity activity, Context applicationContext, SuccessCallback successCallback, ErrorCallback errorCallback) {
+        if (applicationContext == null) {
+            Log.e(GoogleApiAvailabilityConstants.LOG_TAG, "The `ApplicationContext` cannot be null.");
+            errorCallback.onError("GoogleApiAvailability.GoogleApiAvailabilityManager", "Android `ApplicationContext` cannot be null.");
+            return;
+        }
+
+        final int connectionResult = googleApiAvailability
+                .isGooglePlayServicesAvailable(applicationContext);
+
+        if (activity == null) {
+            if (showDialog != null && showDialog) {
+                // Only log warning when `showDialog` property was `true`.
+                Log.w(GoogleApiAvailabilityConstants.LOG_TAG, "Unable to show dialog as `Activity` is not available.");
+            }
+            showDialog = false;
+        }
+
+        if (showDialog != null && showDialog) {
+            googleApiAvailability
+                    .showErrorDialogFragment(activity, connectionResult, GoogleApiAvailabilityConstants.REQUEST_GOOGLE_PLAY_SERVICES);
+        }
+
+        successCallback.onSuccess(GoogleApiAvailabilityConstants.toPlayServiceAvailability(connectionResult));
+    }
+
+    void makeGooglePlayServicesAvailable(Activity activity, MakeGooglePlayServicesAvailableCallback successCallback, ErrorCallback errorCallback) {
+        if (activity == null) {
+            Log.e(GoogleApiAvailabilityConstants.LOG_TAG, "Activity cannot be null.");
+            errorCallback.onError("GoogleApiAvailability.makeGooglePlayServicesAvailable", "Android Activity cannot be null.");
+            return;
+        }
+
+        googleApiAvailability.makeGooglePlayServicesAvailable(activity)
+                .addOnFailureListener((Exception e) -> errorCallback.onError("GoogleApiAvailability.makeGooglePlayServicesAvailable", e.getMessage()))
+                .addOnSuccessListener((Void t) -> successCallback.onSuccess(null));
+    }
+
+    void getErrorString(Context applicationContext, getErrorStringCallback successCallback, ErrorCallback errorCallback) {
+        if (applicationContext == null) {
+            Log.e(GoogleApiAvailabilityConstants.LOG_TAG, "Context cannot be null.");
+            errorCallback.onError("GoogleApiAvailability.getErrorString", "Android context cannot be null.");
+            return;
+        }
+
+        final String errorString = googleApiAvailability.getErrorString(googleApiAvailability.isGooglePlayServicesAvailable(applicationContext));
+
+        successCallback.onSuccess(errorString);
+    }
+
+    void isUserResolvable(Context applicationContext, isUserResolvableCallback successCallback, ErrorCallback errorCallback) {
+        if (applicationContext == null) {
+            Log.e(GoogleApiAvailabilityConstants.LOG_TAG, "Context cannot be null.");
+            errorCallback.onError("GoogleApiAvailability.isUserResolvable", "Android context cannot be null.");
+            return;
+        }
+
+        final int connectionResult = googleApiAvailability
+                .isGooglePlayServicesAvailable(applicationContext);
+
+        successCallback.onSuccess(googleApiAvailability.isUserResolvableError(connectionResult));
+    }
+
+    void showErrorNotification(Context applicationContext, showErrorNotificationCallback successCallback, ErrorCallback errorCallback) {
+        if (applicationContext == null) {
+            Log.e(GoogleApiAvailabilityConstants.LOG_TAG, "Context cannot be null.");
+            errorCallback.onError("GoogleApiAvailability.showErrorNotification", "Android context cannot be null.");
+            return;
+        }
+
+        final int connectionResult = googleApiAvailability
+                .isGooglePlayServicesAvailable(applicationContext);
+
+        googleApiAvailability.showErrorNotification(applicationContext, connectionResult);
+
+        successCallback.onSuccess(null);
+    }
+
+    void showErrorDialogFragment(Context applicationContext, Activity activity, showErrorDialogFragmentCallback successCallback, ErrorCallback errorCallback) {
+        if (applicationContext == null) {
+            Log.e(GoogleApiAvailabilityConstants.LOG_TAG, "Context cannot be null.");
+            errorCallback.onError("GoogleApiAvailability.showErrorDialogFragment", "Android context cannot be null.");
+            return;
+        }
+
+        final int errorCode = googleApiAvailability
+                .isGooglePlayServicesAvailable(applicationContext);
+
+        if (errorCode != GoogleApiAvailabilityConstants.GOOGLE_PLAY_SERVICES_AVAILABILITY_SUCCESS) {
+            googleApiAvailability.showErrorDialogFragment(activity, errorCode, GoogleApiAvailabilityConstants.REQUEST_GOOGLE_PLAY_SERVICES);
+            successCallback.onSuccess(true);
+        }
+
+        successCallback.onSuccess(false);
+    }
+}

android/src/main/java/com/baseflow/googleapiavailability/GoogleApiAvailabilityPlugin.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import androidx.annotation.NonNull;
+
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
@@ -16,10 +17,15 @@
  */
 public class GoogleApiAvailabilityPlugin implements FlutterPlugin, ActivityAware {
 
+    private final GoogleApiAvailabilityManager googleApiAvailabilityManager;
   private MethodChannel channel;
   private MethodCallHandlerImpl methodCallHandler;
 
-  @Override
+    public GoogleApiAvailabilityPlugin() {
+        this.googleApiAvailabilityManager = new GoogleApiAvailabilityManager();
+    }
+
+    @Override
   public void onAttachedToActivity(ActivityPluginBinding binding) {
     methodCallHandler.setActivity(binding.getActivity());
   }
@@ -64,7 +70,7 @@ public boolean onViewDestroy(FlutterNativeView view) {
   }
 
   private void registerPlugin(Context context, BinaryMessenger messenger) {
-    methodCallHandler = new MethodCallHandlerImpl(context);
+    methodCallHandler = new MethodCallHandlerImpl(context, googleApiAvailabilityManager);
     channel = new MethodChannel(messenger, "flutter.baseflow.com/google_api_availability/methods");
     channel.setMethodCallHandler(methodCallHandler);
   }