TouchInstinct
/
android-templates
304
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master-rx-java-2' into kotlin_migration

This commit is contained in:
Anton Domnikov 2017-06-23 13:31:52 +03:00
parent a2fe86ec09 e3666b32b3
commit 9d6aa9c445
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -26,7 +26,7 @@ dependencies {
compile 'com.android.support:multidex:1.0.1'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
compile 'io.reactivex.rxjava2:rxjava:2.1.0'
compile 'io.reactivex.rxjava2:rxjava:2.1.1'
provided 'com.android.support:appcompat-v7:26.0.0-beta2'
provided 'com.android.support:recyclerview-v7:26.0.0-beta2'

10
src/main/java/ru/touchin/templates/DeviceUtils.java
View File

@ -134,12 +134,14 @@ public final class DeviceUtils {
case TelephonyManager.NETWORK_TYPE_HSPAP:
return NetworkType.MOBILE_3G;
case TelephonyManager.NETWORK_TYPE_LTE:
case 19: // NETWORK_TYPE_LTE_CA is hide
return NetworkType.MOBILE_LTE;
case TelephonyManager.NETWORK_TYPE_UNKNOWN:
default:
return NetworkType.NONE;
return NetworkType.UNKNOWN;
}
}
return NetworkType.NONE;
return NetworkType.UNKNOWN;
}
/**
@ -192,6 +194,10 @@ public final class DeviceUtils {
* Wi-Fi network.
*/
WI_FI("Wi-Fi"),
/**
* Unknown network type.
*/
UNKNOWN("unknown"),
/**
* No network.
*/