diff --git a/.travis.yml b/.travis.yml index 2c39e9e4..ac875209 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ android: components: - platform-tools - tools - - build-tools-24.0.3 + - build-tools-25.0.2 - android-22 - - android-24 + - android-25 - sys-img-armeabi-v7a-android-22 - extra-android-m2repository - extra-android-support diff --git a/README.md b/README.md index 2c690f25..88e4e784 100644 --- a/README.md +++ b/README.md @@ -135,6 +135,20 @@ To get current network: WifiInfo currentNetwork = mWiseFy.getCurrentNetwork(); ``` +To get the frequency of the devices current network:

+* NOTE * Only supported on API >= 21 + +```java +int frequency = mWiseFy.getFrequency(); +``` + +To get the frequency of a network:

+* NOTE * Only supported on API >= 21 + +```java +int frequency = mWiseFy.getFrequency(wifiInfo); +``` + To get nearby access points:

Setting filterDuplicates to true will not return SSIDs with a weaker signal strength (will always take the highest) @@ -172,6 +186,20 @@ To check and see if the device is connected to a wifi network: boolean isConnected = mWiseFy.isDeviceConnectedToWifiNetwork(); ``` +To check if the device's current network is 5gHz:

+* NOTE * Only supported on API >= 21 + +```java +boolean is5gHz = mWiseFy.isNetwork5gHz(); +``` + +To check if a network is 5gHz:

+* NOTE * Only supported on API >= 21 + +```java +boolean is5gHz = mWiseFy.isNetwork5gHz(wifiInfo); +``` + To check and see if a given SSID is in the devices set of configured networks: ```java diff --git a/build.gradle b/build.gradle index 489b960a..6d5eeacc 100644 --- a/build.gradle +++ b/build.gradle @@ -6,13 +6,13 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' - classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.6' + classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.2' classpath "com.github.dcendents:android-maven-gradle-plugin:1.5" - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.2' - classpath "org.jacoco:org.jacoco.core:0.7.7.201606060606" - classpath "org.jacoco:org.jacoco.agent:0.7.7.201606060606" - classpath "org.jacoco:org.jacoco.report:0.7.7.201606060606" + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' + classpath "org.jacoco:org.jacoco.core:0.7.8" + classpath "org.jacoco:org.jacoco.agent:0.7.8" + classpath "org.jacoco:org.jacoco.report:0.7.8" } } @@ -46,7 +46,7 @@ subprojects { ext { GROUP = "com.isupatches" - VERSION_NAME = "1.0.5" + VERSION_NAME = "1.0.6" BINTRAY_REPO = "Maven" BINTRAY_NAME = "wisefy" diff --git a/gradle/gradle-bintray-upload.gradle b/gradle/gradle-bintray-upload.gradle index 298c298f..462f6bce 100644 --- a/gradle/gradle-bintray-upload.gradle +++ b/gradle/gradle-bintray-upload.gradle @@ -12,6 +12,7 @@ if (project.hasProperty("android")) { // Android libraries task javadoc(type: Javadoc) { source = android.sourceSets.main.java.srcDirs + destinationDir = file("../javadoc/") classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) } } else { // Java libraries diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 13372aef..3baa851b 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f73024bf..7dec64e2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Oct 15 13:02:11 CDT 2016 +#Sat Feb 04 20:18:00 CST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip diff --git a/gradlew b/gradlew index 9d82f789..27309d92 100755 --- a/gradlew +++ b/gradlew @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then diff --git a/gradlew.bat b/gradlew.bat index aec99730..f6d5974e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,7 +46,7 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args if "%@eval[2+2]" == "4" goto 4NT_args diff --git a/javadoc/allclasses-frame.html b/javadoc/allclasses-frame.html index 388cb8b0..d609a97e 100644 --- a/javadoc/allclasses-frame.html +++ b/javadoc/allclasses-frame.html @@ -2,9 +2,9 @@ - -All Classes (app 1.0.4 API) - + +All Classes (wisefy 1.0.6 API) + diff --git a/javadoc/allclasses-noframe.html b/javadoc/allclasses-noframe.html index daa1be58..f9e7d869 100644 --- a/javadoc/allclasses-noframe.html +++ b/javadoc/allclasses-noframe.html @@ -2,9 +2,9 @@ - -All Classes (app 1.0.4 API) - + +All Classes (wisefy 1.0.6 API) + diff --git a/javadoc/com/isupatches/wisefy/WiseFy.generator.html b/javadoc/com/isupatches/wisefy/WiseFy.generator.html deleted file mode 100644 index 09fe1b87..00000000 --- a/javadoc/com/isupatches/wisefy/WiseFy.generator.html +++ /dev/null @@ -1,327 +0,0 @@ - - - - - -WiseFy.generator (app 1.0.4 API) - - - - - - - - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - -
-
com.isupatches.wisefy
-

Class WiseFy.generator

-
-
- -
- -
-
- -
-
- -
-
- - -
- - -
Skip navigation links
- - - - -
-
- - - -
- -
-
- - -
- - -
- - - diff --git a/javadoc/com/isupatches/wisefy/WiseFy.html b/javadoc/com/isupatches/wisefy/WiseFy.html index 481db33e..30531356 100644 --- a/javadoc/com/isupatches/wisefy/WiseFy.html +++ b/javadoc/com/isupatches/wisefy/WiseFy.html @@ -2,9 +2,9 @@ - -WiseFy (app 1.0.4 API) - + +WiseFy (wisefy 1.0.6 API) + @@ -12,18 +12,12 @@