checkPlayServiceAvailability() uses toPlayServiceAvailability

JDDV · JDDV · commit a949badda6f8 · 2022-02-03T09:57:29.000+01:00
diff --git a/android/src/main/java/com/baseflow/googleapiavailability/GoogleApiAvailabilityConstants.java b/android/src/main/java/com/baseflow/googleapiavailability/GoogleApiAvailabilityConstants.java
@@ -38,7 +38,7 @@ final class GoogleApiAvailabilityConstants {
     }
 
     @GooglePlayServicesAvailability
-    private int toPlayServiceAvailability(int connectionResult) {
+    static int toPlayServiceAvailability(int connectionResult) {
         switch (connectionResult) {
             case ConnectionResult.SUCCESS:
                 return GOOGLE_PLAY_SERVICES_AVAILABILITY_SUCCESS;
diff --git a/android/src/main/java/com/baseflow/googleapiavailability/GoogleApiAvailabilityManager.java b/android/src/main/java/com/baseflow/googleapiavailability/GoogleApiAvailabilityManager.java
@@ -12,7 +12,7 @@ public class GoogleApiAvailabilityManager {
 
     @FunctionalInterface
     interface SuccessCallback {
-        void onSuccess(@GoogleApiAvailabilityConstants.GooglePlayServicesAvailability int connectionResult);
+        void onSuccess(int connectionResult);
     }
 
     @FunctionalInterface
@@ -40,7 +40,7 @@ void checkPlayServicesAvailability(Boolean showDialog, Context applicationContex
                     .showErrorDialogFragment((Activity) applicationContext, connectionResult, GoogleApiAvailabilityConstants.REQUEST_GOOGLE_PLAY_SERVICES);
         }
 
-        successCallback.onSuccess(connectionResult);
+        successCallback.onSuccess(GoogleApiAvailabilityConstants.toPlayServiceAvailability(connectionResult));
     }
 
     void makeGooglePlayServicesAvailable(Activity activity, MakeGooglePlayServicesAvailable successCallback, ErrorCallback errorCallback){

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ final class GoogleApiAvailabilityConstants {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@GooglePlayServicesAvailability`
`41`		`- private int toPlayServiceAvailability(int connectionResult) {`
	`41`	`+ static int toPlayServiceAvailability(int connectionResult) {`
`42`	`42`	`switch (connectionResult) {`
`43`	`43`	`case ConnectionResult.SUCCESS:`
`44`	`44`	`return GOOGLE_PLAY_SERVICES_AVAILABILITY_SUCCESS;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class GoogleApiAvailabilityManager {`
`12`	`12`
`13`	`13`	`@FunctionalInterface`
`14`	`14`	`interface SuccessCallback {`
`15`		`- void onSuccess(@GoogleApiAvailabilityConstants.GooglePlayServicesAvailability int connectionResult);`
	`15`	`+ void onSuccess(int connectionResult);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`@FunctionalInterface`
`@@ -40,7 +40,7 @@ void checkPlayServicesAvailability(Boolean showDialog, Context applicationContex`
`40`	`40`	`.showErrorDialogFragment((Activity) applicationContext, connectionResult, GoogleApiAvailabilityConstants.REQUEST_GOOGLE_PLAY_SERVICES);`
`41`	`41`	`}`
`42`	`42`
`43`		`- successCallback.onSuccess(connectionResult);`
	`43`	`+ successCallback.onSuccess(GoogleApiAvailabilityConstants.toPlayServiceAvailability(connectionResult));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`void makeGooglePlayServicesAvailable(Activity activity, MakeGooglePlayServicesAvailable successCallback, ErrorCallback errorCallback){`