Gabrielalao/fence 1339 upgrade flutter sdk to latest ios and android radar sdk #34
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,16 +67,6 @@ | |
| public class RadarFlutterPlugin implements FlutterPlugin, MethodCallHandler, ActivityAware, RequestPermissionsResultListener { | ||
|
|
||
| private static FlutterEngine sBackgroundFlutterEngine; | ||
|
|
||
| private Activity mActivity; | ||
| private Context mContext; | ||
|
|
@@ -208,9 +198,6 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull final Result result) | |
| case "setAnonymousTrackingEnabled": | ||
| setAnonymousTrackingEnabled(call, result); | ||
| break; | ||
|
There was a problem hiding this comment. For breaking changes, we add entries to There was a problem hiding this comment. We can put all of the renamed functions in there as well, like that latest ios MIGRATION files does |
||
| case "getLocation": | ||
| getLocation(call, result); | ||
| break; | ||
|
|
@@ -229,6 +216,9 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull final Result result) | |
| case "isTracking": | ||
| isTracking(result); | ||
| break; | ||
| case "isUsingRemoteTrackingOptions": | ||
| isUsingRemoteTrackingOptions(result); | ||
| break; | ||
| case "getTrackingOptions": | ||
| getTrackingOptions(result); | ||
| break; | ||
|
|
@@ -274,15 +264,24 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull final Result result) | |
| case "getDistance": | ||
| getDistance(call, result); | ||
| break; | ||
| case "logConversion": | ||
| logConversion(call, result); | ||
| break; | ||
| case "getMatrix": | ||
| getMatrix(call, result); | ||
| break; | ||
| case "setForegroundServiceOptions": | ||
| setForegroundServiceOptions(call, result); | ||
| break; | ||
| case "trackVerified": | ||
| trackVerified(call, result); | ||
| break; | ||
| case "trackVerifiedToken": | ||
| trackVerifiedToken(call, result); | ||
| break; | ||
| case "validateAddress": | ||
| validateAddress(call, result); | ||
| break; | ||
| case "attachListeners": | ||
| attachListeners(call, result); | ||
| break; | ||
|
|
@@ -877,8 +876,9 @@ public void autocomplete(MethodCall call, final Result result) { | |
| String country = call.argument("country"); | ||
| ArrayList layersList = (ArrayList)call.argument("layers"); | ||
| String[] layers = layersList != null ? (String[])layersList.toArray(new String[0]) : new String[0]; | ||
| Boolean expandUnits = call.argument("expandUnits"); | ||
|
|
||
| Radar.autocomplete(query, near, layers, limit, country, expandUnits, new Radar.RadarGeocodeCallback() { | ||
| @Override | ||
| public void onComplete(final Radar.RadarStatus status, final RadarAddress[] addresses) { | ||
| runOnMainThread(new Runnable() { | ||
|
|
@@ -1043,24 +1043,18 @@ public void run() { | |
| } | ||
| } | ||
|
|
||
| public void logConversion(MethodCall call, final Result result) throws JSONException { | ||
| Radar.RadarLogConversionCallback callback = new Radar.RadarLogConversionCallback() { | ||
| @Override | ||
| public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarEvent event) { | ||
| runOnMainThread(new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| try { | ||
| JSONObject obj = new JSONObject(); | ||
| obj.put("status", status.toString()); | ||
| if (event != null) { | ||
| obj.put("event", event.toJson()); | ||
| } | ||
|
|
||
| HashMap<String, Object> map = new Gson().fromJson(obj.toString(), HashMap.class); | ||
|
|
@@ -1073,15 +1067,14 @@ public void run() { | |
| } | ||
| }; | ||
|
|
||
| String name = call.argument("name"); | ||
| HashMap metadataMap= call.argument("metadata"); | ||
| JSONObject metadataJson = jsonForMap(metadataMap); | ||
| if (call.hasArgument("revenue") && call.argument("revenue") != null) { | ||
| double revenue = (Double)call.argument("revenue"); | ||
| Radar.logConversion(name, revenue, metadataJson, callback); | ||
| } else { | ||
| Radar.logConversion(name, metadataJson, callback); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -1139,6 +1132,100 @@ public void run() { | |
| }); | ||
| } | ||
|
|
||
| public void trackVerified(MethodCall call, final Result result) { | ||
| Radar.RadarTrackCallback callback = new Radar.RadarTrackCallback() { | ||
| @Override | ||
| public void onComplete(final Radar.RadarStatus status, final Location location, final RadarEvent[] events, final RadarUser user) { | ||
| runOnMainThread(new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| try { | ||
| JSONObject obj = new JSONObject(); | ||
| obj.put("status", status.toString()); | ||
| if (location != null) { | ||
| obj.put("location", Radar.jsonForLocation(location)); | ||
| } | ||
| obj.put("events", RadarEvent.toJson(events)); | ||
| if ( user != null) { | ||
| obj.put("user", user.toJson()); | ||
| } | ||
|
|
||
| HashMap<String, Object> map = new Gson().fromJson(obj.toString(), HashMap.class); | ||
| result.success(map); | ||
| } catch (Exception e) { | ||
| result.error(e.toString(), e.getMessage(), e.getMessage()); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| Radar.trackVerified(callback); | ||
| } | ||
|
|
||
| public void trackVerifiedToken(MethodCall call, final Result result) { | ||
| Radar.RadarTrackTokenCallback callback = new Radar.RadarTrackTokenCallback() { | ||
| @Override | ||
| public void onComplete(final Radar.RadarStatus status, final String token) { | ||
| runOnMainThread(new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| try { | ||
| JSONObject obj = new JSONObject(); | ||
| obj.put("status", status.toString()); | ||
| obj.put("token", token); | ||
|
|
||
| HashMap<String, Object> map = new Gson().fromJson(obj.toString(), HashMap.class); | ||
| result.success(map); | ||
| } catch (Exception e) { | ||
| result.error(e.toString(), e.getMessage(), e.getMessage()); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| Radar.trackVerifiedToken(callback); | ||
| } | ||
|
|
||
| private void isUsingRemoteTrackingOptions(Result result) { | ||
| Boolean isRemoteTracking = Radar.isUsingRemoteTrackingOptions(); | ||
| result.success(isRemoteTracking); | ||
| } | ||
|
|
||
| public void validateAddress(MethodCall call, final Result result) throws JSONException { | ||
| Radar.RadarValidateAddressCallback callback = new Radar.RadarValidateAddressCallback() { | ||
| @Override | ||
| public void onComplete(final Radar.RadarStatus status, final RadarAddress address, final Radar.RadarAddressVerificationStatus verificationStatus) { | ||
| runOnMainThread(new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| try { | ||
| JSONObject obj = new JSONObject(); | ||
| obj.put("status", status.toString()); | ||
| if (address != null) { | ||
| //obj.put("address", address.toJson()); | ||
|
There was a problem hiding this comment. Let's uncomment this and we'll fix the |
||
| } | ||
| if (verificationStatus != null) { | ||
| obj.put("verificationStatus", verificationStatus.toString()); | ||
| } | ||
|
|
||
| HashMap<String, Object> map = new Gson().fromJson(obj.toString(), HashMap.class); | ||
| result.success(map); | ||
| } catch (Exception e) { | ||
| result.error(e.toString(), e.getMessage(), e.getMessage()); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| HashMap addressMap= call.argument("address"); | ||
| JSONObject addressJSON = jsonForMap(addressMap); | ||
| RadarAddress address = RadarAddress.fromJson(addressJSON); | ||
| Radar.validateAddress(address, callback); | ||
| } | ||
|
|
||
| private Location locationForMap(HashMap locationMap) { | ||
| double latitude = (Double)locationMap.get("latitude"); | ||
| double longitude = (Double)locationMap.get("longitude"); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <network-security-config> | ||
| <domain-config cleartextTrafficPermitted="false"> | ||
| <domain includeSubdomains="true">api-verified.radar.io</domain> | ||
| <pin-set> | ||
| <pin digest="SHA-256">15ktYXSSU2llpy7YyCgeqUKDBkjcimK/weUcec960sI=</pin> | ||
| <pin digest="SHA-256">15ktYXSSU2llpy7YyCgeqUKDBkjcimK/weUcec960sI=</pin> | ||
| </pin-set> | ||
| </domain-config> | ||
| <domain-config cleartextTrafficPermitted="false"> | ||
| <domain includeSubdomains="true">api-verified.radar-staging.com</domain> | ||
| <pin-set> | ||
| <pin digest="SHA-256">09MICn++JSUz2tk36fH+5qiuUAbbxx4JzrAHR3QHu/I=</pin> | ||
| <pin digest="SHA-256">09MICn++JSUz2tk36fH+5qiuUAbbxx4JzrAHR3QHu/I=</pin> | ||
| </pin-set> | ||
| </domain-config> | ||
| </network-security-config> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's do
3.2