diff --git a/.gitignore b/.gitignore
index c6cbe562..5f940083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
*.iml
.gradle
/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea
.DS_Store
/build
/captures
diff --git a/.travis.yml b/.travis.yml
index aa69371a..1ec588ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ android:
components:
- platform-tools
- tools
- - build-tools-25.0.3
+ - build-tools-26.0.0
- android-22
- android-26
- sys-img-armeabi-v7a-android-22
@@ -21,4 +21,4 @@ before_script:
- android-wait-for-emulator
- adb shell input keyevent 82 &
-script: travis_wait 60 ./gradlew clean connectedAndroidTest -PdisablePreDex --stacktrace
\ No newline at end of file
+script: travis_wait 90 ./gradlew clean connectedAndroidTest -PdisablePreDex --stacktrace
\ No newline at end of file
diff --git a/README.md b/README.md
index 64713aac..a985ac19 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,21 @@ Wifi configuration and util library built for Android.
>
> Supports Android SDK levels 16-26
-[![Android Weekly](https://img.shields.io/badge/Android%20Weekly-%23230-blue.svg)](http://androidweekly.net/issues/issue-230) [![Build Status](https://travis-ci.org/isuPatches/WiseFy.svg?branch=master)](https://travis-ci.org/isuPatches/WiseFy) [ ![Download](https://api.bintray.com/packages/isupatches/Maven/wisefy/images/download.svg) ](https://bintray.com/isupatches/Maven/wisefy/_latestVersion)
+[![Android Weekly](https://img.shields.io/badge/Android%20Weekly-%23230-blue.svg)](http://androidweekly.net/issues/issue-230) [![Build Status](https://travis-ci.org/isuPatches/WiseFy.svg?branch=master)](https://travis-ci.org/isuPatches/WiseFy) [ ![Download](https://api.bintray.com/packages/isupatches/Maven/wisefy/images/download.svg) ](https://bintray.com/isupatches/Maven/wisefy/_latestVersion)
+
+## What's New in 2.x
+
+- Asynchronous API
+ - Certain methods have callbacks and are run on background thread
+- Ability search by regex
+ - Nearby access points
+ - Saved Configurations
+ - SSIDs
+- Ability to query for RSSI
+- Ability to query for if device is roaming
+- Additional methods to query for network security
+- Full fledged documentation directory
+- Tested against Android O
## Adding to your project
diff --git a/build.gradle b/build.gradle
index 054fc123..9991176b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ subprojects {
ext {
GROUP = "com.isupatches"
- VERSION_NAME = "2.0.0-BETA1"
+ VERSION_NAME = "2.0.0"
BINTRAY_REPO = "Maven"
BINTRAY_NAME = "wisefy"
diff --git a/changes/1.x.md b/changes/1.x.md
index ea974a9e..bf83a8aa 100644
--- a/changes/1.x.md
+++ b/changes/1.x.md
@@ -5,14 +5,14 @@ commit b6c2e176b1908219ff45432f1279e1ec114d2a06
Merge: 35c7170 82ee0c4
Author: Patches
Date: Tue Jul 4 11:34:36 2017 -0500
-
+
v1.0.10
#### More constants, update tests, more safety checks, update javadocs
commit 82ee0c49fa2a12a71ba5cca8230d43c42d96bce4
Author: isuPatches
Date: Tue Jul 4 09:40:11 2017 -0500
-
+
close #57
#### Update javadocs for 1.0.10
@@ -24,7 +24,7 @@ Date: Tue Jul 4 09:14:31 2017 -0500
commit 24e7971090f4fe1c23d9ba92c7f35767b3e8f350
Author: isuPatches
Date: Tue Jul 4 09:02:04 2017 -0500
-
+
close #55
#### Merge branch 'master' into develop
@@ -47,7 +47,7 @@ Date: Mon Jul 3 13:09:34 2017 -0500
#### Update README.md
commit 4e9c3798ca4667c348d924179cd5a61cd330e050
Author: Patches
-Date: Mon Jul 3 13:09:13 2017 -0500
+Date: Mon Jul 3 13:09:13 2017 -0500
#### Merge branch 'master' into develop
commit 92485511c239eee8e25e2cd9c2fc4ad7ba02bec5
@@ -64,7 +64,7 @@ Date: Mon Jul 3 13:06:41 2017 -0500
commit f6f1e314d89e9ed195e7f6a0966b2f1a1afd70fb
Merge: 1bc3eaa 287bf7f
Author: isuPatches
-Date: Mon Jul 3 12:35:46 2017 -0500
+Date: Mon Jul 3 12:35:46 2017 -0500
#### Update README.md
commit 287bf7fd96bba4fe9d10c4f01ad18270bfd8a772
@@ -76,12 +76,12 @@ commit 1bc3eaa83f8b44ff70bcda796130d57d485d4b1e
Merge: 6603ea2 2b5233e
Author: isuPatches
Date: Mon Jul 3 12:05:03 2017 -0500
-
+
#### Update CHANGE.md
commit 2b5233ed20f405fbdc634600579d067290ec04a3
Author: Patches
Date: Mon Jul 3 12:03:46 2017 -0500
-
+
## v1.0.9 - 07/03/2017
#### Merge pull request #54 from isuPatches/develop
@@ -89,7 +89,7 @@ commit 9fb7b3bf171f25d0a53d10f27d224a15ed6d107f
Merge: 4e22889 6603ea2
Author: Patches
Date: Mon Jul 3 11:58:32 2017 -0500
-
+
v1.0.9
#### Undo bintray props
@@ -805,4 +805,4 @@ Date: Tue Apr 26 15:25:33 2016 -0500
#### Initial commit
commit 58826f9cd9002b5407c6bbaa540c49da46eee3f5
Author: isuPatches
-Date: Tue Apr 26 15:09:41 2016 -0500
+Date: Tue Apr 26 15:09:41 2016 -0500
\ No newline at end of file
diff --git a/changes/2.x.md b/changes/2.x.md
index 3a6edb0e..c86cb625 100644
--- a/changes/2.x.md
+++ b/changes/2.x.md
@@ -1,128 +1,126 @@
-## v2.0.0 07/22/2017
-
-#### Last part of 2.0.0 going up
-commit 625ee1337c82ad4a6fbdde7e5c9bd375c1ae134d
-Author: isuPatches
-Date: Sat Jul 22 22:37:31 2017 -0500
-
- close #63
- close #73
- close #75
-
-#### Update .gitignore
-commit c41d1358feda96db6bb0a7979e61f476c9a63c1f
-Author: Patches
-Date: Fri Jul 21 19:46:32 2017 -0500
-
-## v2.0.0-BETA1 07/20/2017
-
-#### Merge branch '2.x' into develop
-commit c756d917a72d5942960abc7709c4641cd9483ad3
-Merge: 063f988 bf31952
-Author: isuPatches
-Date: Thu Jul 20 06:22:36 2017 -0500
-
-#### Updates for BETA1
-commit bf3195252594583a28d1a1d6a4f5d0d81e423a4c
-Author: isuPatches
-Date: Thu Jul 20 06:12:26 2017 -0500
-
-#### Merge pull request #74 from isuPatches/develop
-commit 361907754313448d9f33363ef5fcd56f35b49cf5
-Merge: 0a3cc80 063f988
-Author: Patches
-Date: Thu Jul 20 06:02:22 2017 -0500
-
- 2.0.0-BETA1
-
-#### Another tweak
-commit 063f988d15d577b7e4935693bb013173275d5918
-Author: isuPatches
-Date: Sun Jul 16 22:10:53 2017 -0500
-
-#### More changeling and documentation updates
-commit 7d8242181f8853037f6c75dc6aaef795d637bb82
-Author: isuPatches
-Date: Sun Jul 16 22:06:49 2017 -0500
-
-#### Even more documentation updates
-commit 320a3e945dcc976cf4426ef1746e4e9ecd941b69
-Author: isuPatches
-Date: Sun Jul 16 22:02:55 2017 -0500
-
-#### More tests and updated documentation
-commit d981721a100eae6ce37da1d0e05884f1157959cc
-Author: isuPatches
-Date: Sun Jul 16 20:09:36 2017 -0500
-
-#### WIP
-commit 07ccac75a44440424bb2c12b24b00cbbdc1b8b5c
-Author: isuPatches
-Date: Sun Jul 16 11:28:58 2017 -0500
-
- close #68
- close #69
- close #70
- close #71
- close #72
-
-#### test
-commit aed5d0dc0053f0e8327b422a9414439dde9286b2
-Author: isuPatches
-Date: Sat Jul 15 15:44:56 2017 -0500
-
-#### Update wait in travis.yml
-commit 81a4c843195f9f5ece331483527038bf787c9c4b
-Author: isuPatches
-Date: Fri Jul 14 20:45:37 2017 -0500
-
-#### Slowly getting there
-commit 4afd442f10cff83454d5084d6c326297a2931b6b
-Author: isuPatches
-Date: Tue Jul 11 08:23:50 2017 -0500
-
-#### Even more cleanup for 2.x
-commit 1d2c32014c748d64322c00651a2aa1d5dca69930
-Author: isuPatches
-Date: Mon Jul 10 07:35:10 2017 -0500
-
-#### More cleanup for 2.x
-commit 086098cdf80204c38314ac672bd07750665b53fc
-Author: isuPatches
-Date: Mon Jul 10 07:30:16 2017 -0500
-
-#### Update travis.yml
-commit 1df8e7be3bf747a612699a3b0e1502cb46281ebd
-Author: isuPatches
-Date: Sun Jul 9 14:36:51 2017 -0500
-
-#### Merge branch '2.x' into develop
-commit 55af07095ee92166261afd27dd856293bb2acbe1
-Merge: 9cb52a6 0a3cc80
-Author: isuPatches
-Date: Sun Jul 9 14:23:10 2017 -0500
-
-#### Start of 2.x
-commit 0a3cc801f8f030ed30419b698f9d8f96eca9df5b
-Author: isuPatches
-Date: Sun Jul 9 14:22:23 2017 -0500
-
- close #58
- close #59
- close #60
- close #61
- close #62
- close #64
-
-#### Merge branch 'master' into develop
-commit 9cb52a65ad54f2c5dd7e8c034588742be72a85c9
-Merge: 82ee0c4 dd48414
-Author: isuPatches
-Date: Tue Jul 4 11:38:01 2017 -0500
-
-#### Update README.md
-commit dd48414f94e2ae5a7aee9275cdac39c7107930d1
-Author: Patches
-Date: Tue Jul 4 11:35:57 2017 -0500
-
-
+## v2.0.0 - 07/22/2017
+
+#### Last part of 2.0.0 going up
+commit 625ee1337c82ad4a6fbdde7e5c9bd375c1ae134d
+Author: isuPatches
+Date: Sat Jul 22 22:37:31 2017 -0500
+
+ close #63
+ close #73
+ close #75
+
+#### Update .gitignore
+commit c41d1358feda96db6bb0a7979e61f476c9a63c1f
+Author: Patches
+Date: Fri Jul 21 19:46:32 2017 -0500
+
+## v2.0.0-BETA1 - 07/20/2017
+
+#### Merge branch '2.x' into develop
+commit c756d917a72d5942960abc7709c4641cd9483ad3
+Merge: 063f988 bf31952
+Author: isuPatches
+Date: Thu Jul 20 06:22:36 2017 -0500
+
+#### Updates for BETA1
+commit bf3195252594583a28d1a1d6a4f5d0d81e423a4c
+Author: isuPatches
+Date: Thu Jul 20 06:12:26 2017 -0500
+
+#### Merge pull request #74 from isuPatches/develop
+commit 361907754313448d9f33363ef5fcd56f35b49cf5
+Merge: 0a3cc80 063f988
+Author: Patches
+Date: Thu Jul 20 06:02:22 2017 -0500
+
+ 2.0.0-BETA1
+
+#### Another tweak
+commit 063f988d15d577b7e4935693bb013173275d5918
+Author: isuPatches
+Date: Sun Jul 16 22:10:53 2017 -0500
+
+#### More changeling and documentation updates
+commit 7d8242181f8853037f6c75dc6aaef795d637bb82
+Author: isuPatches
+Date: Sun Jul 16 22:06:49 2017 -0500
+
+#### Even more documentation updates
+commit 320a3e945dcc976cf4426ef1746e4e9ecd941b69
+Author: isuPatches
+Date: Sun Jul 16 22:02:55 2017 -0500
+
+#### More tests and updated documentation
+commit d981721a100eae6ce37da1d0e05884f1157959cc
+Author: isuPatches
+Date: Sun Jul 16 20:09:36 2017 -0500
+
+#### WIP
+commit 07ccac75a44440424bb2c12b24b00cbbdc1b8b5c
+Author: isuPatches
+Date: Sun Jul 16 11:28:58 2017 -0500
+
+ close #68
+ close #69
+ close #70
+ close #71
+ close #72
+
+#### test
+commit aed5d0dc0053f0e8327b422a9414439dde9286b2
+Author: isuPatches
+Date: Sat Jul 15 15:44:56 2017 -0500
+
+#### Update wait in travis.yml
+commit 81a4c843195f9f5ece331483527038bf787c9c4b
+Author: isuPatches
+Date: Fri Jul 14 20:45:37 2017 -0500
+
+#### Slowly getting there
+commit 4afd442f10cff83454d5084d6c326297a2931b6b
+Author: isuPatches
+Date: Tue Jul 11 08:23:50 2017 -0500
+
+#### Even more cleanup for 2.x
+commit 1d2c32014c748d64322c00651a2aa1d5dca69930
+Author: isuPatches
+Date: Mon Jul 10 07:35:10 2017 -0500
+
+#### More cleanup for 2.x
+commit 086098cdf80204c38314ac672bd07750665b53fc
+Author: isuPatches
+Date: Mon Jul 10 07:30:16 2017 -0500
+
+#### Update travis.yml
+commit 1df8e7be3bf747a612699a3b0e1502cb46281ebd
+Author: isuPatches
+Date: Sun Jul 9 14:36:51 2017 -0500
+
+#### Merge branch '2.x' into develop
+commit 55af07095ee92166261afd27dd856293bb2acbe1
+Merge: 9cb52a6 0a3cc80
+Author: isuPatches
+Date: Sun Jul 9 14:23:10 2017 -0500
+
+#### Start of 2.x
+commit 0a3cc801f8f030ed30419b698f9d8f96eca9df5b
+Author: isuPatches
+Date: Sun Jul 9 14:22:23 2017 -0500
+
+ close #58
+ close #59
+ close #60
+ close #61
+ close #62
+ close #64
+
+#### Merge branch 'master' into develop
+commit 9cb52a65ad54f2c5dd7e8c034588742be72a85c9
+Merge: 82ee0c4 dd48414
+Author: isuPatches
+Date: Tue Jul 4 11:38:01 2017 -0500
+
+#### Update README.md
+commit dd48414f94e2ae5a7aee9275cdac39c7107930d1
+Author: Patches
+Date: Tue Jul 4 11:35:57 2017 -0500
\ No newline at end of file
diff --git a/documentation/adding_and_removing_networks.md b/documentation/adding_and_removing_networks.md
index fcff666e..92bbd2de 100644
--- a/documentation/adding_and_removing_networks.md
+++ b/documentation/adding_and_removing_networks.md
@@ -41,7 +41,7 @@ mWiseFy.addOpenNetwork("Open Network", new AddOpenNetworkCallbacks() {
}
@Override
- public void openNetworkAdded(WifiConfiguration wifiConfiguration) {
+ public void openNetworkAdded(WifiConfiguration openNetwork) {
}
});
@@ -62,7 +62,7 @@ mWiseFy.addWEPNetwork("WEP Network", "123456", new AddWEPNetworkCallbacks() {
}
@Override
- public void wepNetworkAdded(WifiConfiguration wifiConfiguration) {
+ public void wepNetworkAdded(WifiConfiguration wepNetwork) {
}
});
@@ -83,7 +83,7 @@ mWiseFy.addWPA2Network("WPA2 Network", "12345678", new AddWPA2NetworkCallbacks()
}
@Override
- public void wpa2NetworkAdded(WifiConfiguration wifiConfiguration) {
+ public void wpa2NetworkAdded(WifiConfiguration wpa2Network) {
}
});
diff --git a/documentation/checking_device_connectivity.md b/documentation/checking_device_connectivity.md
index 8044ce76..de282a43 100644
--- a/documentation/checking_device_connectivity.md
+++ b/documentation/checking_device_connectivity.md
@@ -24,6 +24,12 @@ To check and see if the device is connected to a wifi network:
boolean isConnected = mWiseFy.isDeviceConnectedToWifiNetwork();
```
+To check and see if the device is roaming:
+
+```java
+mWiseFy.isDeviceRoaming();
+```
+
To check and see if Wifi is enabled on a device:
```java
diff --git a/documentation/nearby_access_points.md b/documentation/nearby_access_points.md
index c4440098..784f430c 100644
--- a/documentation/nearby_access_points.md
+++ b/documentation/nearby_access_points.md
@@ -1,12 +1,26 @@
#### Via The Synchronous API
To get nearby access points:
-Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)
+Setting filterDuplicates to true will exclude access points for an SSID that have a weaker RSSI (will always take the highest signal strength)
```java
List nearbyAccessPoints = mWiseFy.getNearbyAccessPoints(true);
```
+To search for an access point given a regex (will return first match):
+Setting filterDuplicates to true will return the access point with the highest RSSI for the given SSID
+
+```java
+mWiseFy.searchForAccessPoint("regex for SSID", 3000, true);
+```
+
+To search for all access points matching a given regex:
+Setting filterDuplicates to true will exclude access points for an SSID that have a weaker RSSI (will always take the highest signal strength)
+
+```java
+mWiseFy.searchForAccessPoints("regex for SSID", true);
+```
+
To search for an SSID given a regex (will return first match):
```java
@@ -21,8 +35,8 @@ List ssids = mWiseFy.searchForSSIDs("regex for SSIDs");
#### Via The Asynchronous API
-To get all nearby access points:
-Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest)
+To get nearby access points:
+Setting filterDuplicates to true will exclude access points for an SSID that have a weaker RSSI (will always take the highest signal strength)
```java
WiseFy.getNearbyAccessPoints(true, new GetNearbyAccessPointsCallbacks() {
@@ -38,6 +52,51 @@ WiseFy.getNearbyAccessPoints(true, new GetNearbyAccessPointsCallbacks() {
});
```
+To search for an access point given a regex (will return first match):
+Setting filterDuplicates to true will return the access point with the highest RSSI (will always take the highest signal strength)
+
+```java
+mWiseFy.searchForAccessPoint("regex for SSID", 3000, true, new SearchForAccessPointCallbacks() {
+ @Override
+ public void searchForAccessPointWiseFyFailure(Integer wisefyReturnCode) {
+
+ }
+
+ @Override
+ public void accessPointFound(ScanResult accessPoint) {
+
+ }
+
+ @Override
+ public void accessPointNotFound() {
+
+ }
+});
+```
+
+To search for all access points matching a given regex:
+Setting filterDuplicates to true will exclude access points for an SSID that have a weaker RSSI (will always take the highest signal strength)
+
+
+```java
+mWiseFy.searchForAccessPoints("regex for SSID", true, new SearchForAccessPointsCallbacks() {
+ @Override
+ public void searchForAccessPointsWiseFyFailure(Integer wisefyReturnCode) {
+
+ }
+
+ @Override
+ public void foundAccessPoints(List accessPoints) {
+
+ }
+
+ @Override
+ public void noAccessPointsFound() {
+
+ }
+});
+```
+
To search for an SSID given a regex (will return first match):
```java
@@ -62,7 +121,7 @@ mWiseFy.searchForSSID("regex for SSID", 3000, new SearchForSSIDCallbacks() {
To search for all SSIDs matching a given regex:
```java
-mWiseFy.searchForSSIDs("regex for SSIDs", new SearchForSSIDsCallbacks() {
+mWiseFy.searchForSSIDs("regex for SSID", new SearchForSSIDsCallbacks() {
@Override
public void searchForSSIDsWiseFyFailure(Integer wisefyReturnCode) {
diff --git a/documentation/rssi.md b/documentation/rssi.md
index 5246672d..7c828d5d 100644
--- a/documentation/rssi.md
+++ b/documentation/rssi.md
@@ -12,7 +12,8 @@ To compare the signal strength of two networks:
int result = mWiseFy.compareSignalLevel(-35, -70);
```
-To get the RSSI of the first SSID matching a given regex:
+To get the RSSI of the first SSID matching a given regex:
+Setting takeHighest to true will return the access point with the highest RSSI for the given SSID
```java
Integer rssi = mWiseFy.getRSSI("regex for SSID", true, 3000);
diff --git a/documentation/saved_networks.md b/documentation/saved_networks.md
index 415ddde9..e5404e6d 100644
--- a/documentation/saved_networks.md
+++ b/documentation/saved_networks.md
@@ -46,6 +46,7 @@ To get the first saved network that matches a given regex:
}
});
```
+
To retrieve all of the saved networks:
```java
@@ -66,6 +67,7 @@ mWiseFy.getSavedNetworks(new GetSavedNetworksCallbacks() {
}
});
```
+
To return all saved networks that match a given regex:
```java
@@ -86,6 +88,7 @@ mWiseFy.getSavedNetwork("regex for SSID", new GetSavedNetworkCallbacks() {
}
});
```
+
***Notes***
- Will return a WiseFy error code if parameter is missing
diff --git a/javadoc/allclasses-frame.html b/javadoc/allclasses-frame.html
index 5496fcfb..bfc961d3 100644
--- a/javadoc/allclasses-frame.html
+++ b/javadoc/allclasses-frame.html
@@ -2,9 +2,9 @@
-
-All Classes (wisefy 2.0.0-BETA1 API)
-
+
+All Classes (wisefy 2.0.0 API)
+
@@ -28,9 +28,11 @@