From e97bce4061b698635380e5b0d4c7247c1b3cd063 Mon Sep 17 00:00:00 2001 From: Gavriil Date: Wed, 21 Jun 2017 15:10:24 +0300 Subject: [PATCH 1/2] Merge pull request #63 from TouchInstinct/bugs/network_type fix getNetworkType --- src/main/java/ru/touchin/templates/DeviceUtils.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/touchin/templates/DeviceUtils.java b/src/main/java/ru/touchin/templates/DeviceUtils.java index 229a5a6..2bd5a48 100644 --- a/src/main/java/ru/touchin/templates/DeviceUtils.java +++ b/src/main/java/ru/touchin/templates/DeviceUtils.java @@ -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. */ From e3666b32b33dbaf0394f7601309c632f3b669798 Mon Sep 17 00:00:00 2001 From: Alexander Bubnov Date: Wed, 21 Jun 2017 17:04:42 +0300 Subject: [PATCH 2/2] update rxJava2 to 2.1.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e64b73f..944ecd0 100644 --- a/build.gradle +++ b/build.gradle @@ -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:25.3.1' provided 'com.android.support:recyclerview-v7:25.3.1'