Skip to content

Commit 2737bf8

Browse files
author
zack
committed
Merge branch 'develop'
2 parents 59514f4 + c11495b commit 2737bf8

File tree

8 files changed

+20
-7
lines changed

8 files changed

+20
-7
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5777bc0d9751d98fcbc894a9d25a9cfc8aae4bb2
1+
f8de1aa5e78bc895a3042226de5860b1d90903a0

module/inspector/ios-inspector/ForgeModule/ForgeModule.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

module/module/android/build_steps.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@
4848
}
4949
}
5050
},
51+
{
52+
"do": {
53+
"android_add_permission": {
54+
"permission": "android.permission.BROADCAST_STICKY"
55+
}
56+
}
57+
},
5158

5259
{
5360
"do": {

module/module/android/module.jar

0 Bytes
Binary file not shown.

module/module/ios/module.a

-1.35 KB
Binary file not shown.

module/module/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"platform_version": "v2.0.0", "version": "0.4.32", "description": "Urban Airship Plugin", "name": "urbanairship"}
1+
{"platform_version": "v2.0.0", "version": "0.4.33", "description": "Urban Airship Plugin", "name": "urbanairship"}

urbanairship_demoapp/src/fixtures/urbanairship/location.properties

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# These settings correspond to the minimum distance and time passed to
22
# Android's LocationManager when requesting location updates.
3-
updateIntervalMeters = 500
4-
updateIntervalSeconds = 900
3+
updateIntervalMeters = 25
4+
updateIntervalSeconds = 30
55

66
# Flag indicating whether the application is allowed to use location.
77
# You must still enable location inside the application with
@@ -18,9 +18,8 @@ allowGPSForLocationTracking = true
1818

1919
# These settings correspond to the properties of Android's Criteria
2020
# class and are used when determining a location provider.
21-
22-
accuracy = ACCURACY_COARSE
23-
powerRequirement = POWER_LOW
21+
accuracy = ACCURACY_FINE
22+
powerRequirement = POWER_MEDIUM
2423
altitudeRequired = false
2524
bearingRequired = false
2625
speedRequired = false

0 commit comments

Comments
 (0)