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

Merge 2c625c2d98 into 33903efadc

This commit is contained in:
maxbach 2018-06-05 06:47:13 +00:00 committed by GitHub
parent 33903efadc 2c625c2d98
commit 367b3d256d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@
package ru.touchin.templates;
import android.annotation.SuppressLint;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@ -91,6 +92,7 @@ public final class DeviceUtils {
if (!TextUtils.equals(androidId, BUGGED_DEVICE_ID)) {
uuid = UUID.nameUUIDFromBytes(androidId.getBytes("utf8"));
} else {
@SuppressLint("MissingPermission")
final String deviceId = ((TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId();
uuid = deviceId != null ? UUID.nameUUIDFromBytes(deviceId.getBytes("utf8")) : UUID.randomUUID();
}
@ -113,6 +115,7 @@ public final class DeviceUtils {
@NonNull
public static NetworkType getNetworkType(@NonNull final Context context) {
final ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
@SuppressLint("MissingPermission")
final NetworkInfo info = cm.getActiveNetworkInfo();
if (info == null || !info.isConnected()) {
return NetworkType.NONE;