From bc054e4e12cfdac6e93a99d4e53a5dc3e6252546 Mon Sep 17 00:00:00 2001 From: "David G. Young" Date: Sun, 7 Aug 2016 17:12:37 -0400 Subject: [PATCH 1/4] Update README with latest Android Studio Version used --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d40c57038..8b9a808a1 100644 --- a/README.md +++ b/README.md @@ -58,13 +58,13 @@ replacing `${altbeacon.version}` with the version you wish to use. ## How to build this Library This project uses an AndroidStudio/gradle build system and is known working with Android Studio -1.0.1 and Gradle 2.2.1 +2.1 and Gradle 2.2.1 Key Gradle build targets: ./gradlew test # run unit tests ./gradlew build # development build - ./gradlew release # release build + ./gradlew release -Prelease # release build ./gradlew generatereleaseJavadoc -Prelease ## License From 27a122e81db49eafb97787cb1aa9cc7368fc3c3a Mon Sep 17 00:00:00 2001 From: Christopher Sexton Date: Wed, 17 Aug 2016 12:39:13 -0400 Subject: [PATCH 2/4] Fix markdown formatting for issue template The headers were not rendering in the actual issues, this just adds a space between the `#` and the copy in the headers. --- .github/ISSUE_TEMPLATE.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index cac7db9e2..f9bb95cd2 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,11 +1,11 @@ -###Expected behavior +### Expected behavior -###Actual behavior +### Actual behavior -###Steps to reproduce this behavior +### Steps to reproduce this behavior -###Mobile device model and OS version +### Mobile device model and OS version -###Android Beacon Library version +### Android Beacon Library version IMPORTANT: This forum is reserved for feature requests or reproducible bugs with the library itself. If you need help with using the library with your project, please open a new question on StackOverflow.com. From 247f0a5d33b5e1b638d653ac40a541f796e312d9 Mon Sep 17 00:00:00 2001 From: olivier stevens Date: Wed, 21 Sep 2016 17:22:26 +0200 Subject: [PATCH 3/4] #Issues403 - No Monitoring Information --- src/main/java/org/altbeacon/beacon/service/BeaconService.java | 2 +- src/main/java/org/altbeacon/beacon/service/Callback.java | 3 +++ .../java/org/altbeacon/beacon/service/MonitoringStatus.java | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/altbeacon/beacon/service/BeaconService.java b/src/main/java/org/altbeacon/beacon/service/BeaconService.java index 4bc6b4274..59b05698f 100644 --- a/src/main/java/org/altbeacon/beacon/service/BeaconService.java +++ b/src/main/java/org/altbeacon/beacon/service/BeaconService.java @@ -325,7 +325,7 @@ public void stopRangingBeaconsInRegion(Region region) { public void startMonitoringBeaconsInRegion(Region region, Callback callback) { LogManager.d(TAG, "startMonitoring called"); - monitoringStatus.addRegion(region); + monitoringStatus.addRegion(region, callback); LogManager.d(TAG, "Currently monitoring %s regions.", monitoringStatus.regionsCount()); mCycledScanner.start(); } diff --git a/src/main/java/org/altbeacon/beacon/service/Callback.java b/src/main/java/org/altbeacon/beacon/service/Callback.java index 1c5005a40..aa0ddb6ab 100644 --- a/src/main/java/org/altbeacon/beacon/service/Callback.java +++ b/src/main/java/org/altbeacon/beacon/service/Callback.java @@ -63,6 +63,9 @@ public Intent getIntent() { * @return false if it callback cannot be made */ public boolean call(Context context, String dataName, Parcelable data) { + if(intent == null){ + initializeIntent(); + } if (intent != null) { LogManager.d(TAG, "attempting callback via intent: %s", intent.getComponent()); intent.putExtra(dataName, data); diff --git a/src/main/java/org/altbeacon/beacon/service/MonitoringStatus.java b/src/main/java/org/altbeacon/beacon/service/MonitoringStatus.java index 5faa1fbfa..fdf5644d3 100644 --- a/src/main/java/org/altbeacon/beacon/service/MonitoringStatus.java +++ b/src/main/java/org/altbeacon/beacon/service/MonitoringStatus.java @@ -50,7 +50,7 @@ public MonitoringStatus(Context context) { this.mContext = context; } - public synchronized void addRegion(Region region) { + public synchronized void addRegion(Region region, Callback callback) { if (getRegionsStateMap().containsKey(region)) { // if the region definition hasn't changed, becasue if it has, we need to clear state // otherwise a region with the same uniqueId can never be changed @@ -70,7 +70,7 @@ public synchronized void addRegion(Region region) { } } } - getRegionsStateMap().put(region, new RegionMonitoringState(new Callback(mContext.getPackageName()))); + getRegionsStateMap().put(region, new RegionMonitoringState(callback)); saveMonitoringStatusIfOn(); } From dd25a6f50073a2592159ffdcb807d530ae162b0b Mon Sep 17 00:00:00 2001 From: olivier stevens Date: Thu, 22 Sep 2016 11:10:16 +0200 Subject: [PATCH 4/4] #Test: update methode signature --- .../org/altbeacon/beacon/service/MonitoringStatusTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/altbeacon/beacon/service/MonitoringStatusTest.java b/src/test/java/org/altbeacon/beacon/service/MonitoringStatusTest.java index 585a718e5..a568743bd 100644 --- a/src/test/java/org/altbeacon/beacon/service/MonitoringStatusTest.java +++ b/src/test/java/org/altbeacon/beacon/service/MonitoringStatusTest.java @@ -44,7 +44,7 @@ public void savesStatusOfUpTo50RegionsTest() throws Exception { MonitoringStatus monitoringStatus = new MonitoringStatus(context); for (int i = 0; i < 50; i++) { Region region = new Region(""+i, null, null, null); - monitoringStatus.addRegion(region); + monitoringStatus.addRegion(region, null); } monitoringStatus.saveMonitoringStatusIfOn(); MonitoringStatus monitoringStatus2 = new MonitoringStatus(context); @@ -58,7 +58,7 @@ public void clearsStatusOfOver50RegionsTest() throws Exception { MonitoringStatus monitoringStatus = new MonitoringStatus(context); for (int i = 0; i < 51; i++) { Region region = new Region(""+i, null, null, null); - monitoringStatus.addRegion(region); + monitoringStatus.addRegion(region, null); } monitoringStatus.saveMonitoringStatusIfOn(); MonitoringStatus monitoringStatus2 = new MonitoringStatus(context); @@ -72,7 +72,7 @@ public void refusesToRestoreRegionsIfTooMuchTimeHasPassedSinceSavingTest() throw MonitoringStatus monitoringStatus = new MonitoringStatus(context); for (int i = 0; i < 50; i++) { Region region = new Region(""+i, null, null, null); - monitoringStatus.addRegion(region); + monitoringStatus.addRegion(region, null); } monitoringStatus.saveMonitoringStatusIfOn(); // Set update time to one hour ago