mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed NPE during getting system connectivity service (top crash in developer console)

Browse source
This commit is contained in:
Александр Зацепин 2019-11-08 15:59:13 +03:00 • committed by yoksnod
parent 2162ecee58
commit bfba4ffef6
2 changed files with 54 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/mapswithme/maps/scheduling/JobServiceDelegate.java
View file

@ -18,7 +18,7 @@ class JobServiceDelegate
boolean onStartJob()
{
ConnectionState.Type type = ConnectionState.requestCurrentType();
ConnectionState.Type type = ConnectionState.requestCurrentType(mApp);
if (type == ConnectionState.Type.WIFI)
NotificationService.startOnConnectivityChanged(mApp);

57
android/src/com/mapswithme/util/ConnectionState.java
View file

@ -1,5 +1,6 @@
package com.mapswithme.util;
import android.app.Application;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
@ -44,17 +45,50 @@ public class ConnectionState
}
}
/**
* Use the {@link #isNetworkConnected(Context, int)} method instead.
*/
@Deprecated
private static boolean isNetworkConnected(int networkType)
{
final NetworkInfo info = getActiveNetwork();
return info != null && info.getType() == networkType && info.isConnected();
}
public static
@Nullable
NetworkInfo getActiveNetwork()
private static boolean isNetworkConnected(@NonNull Context context, int networkType)
{
return ((ConnectivityManager) MwmApplication.get().getSystemService(Context.CONNECTIVITY_SERVICE)).getActiveNetworkInfo();
final NetworkInfo info = getActiveNetwork(context);
return info != null && info.getType() == networkType && info.isConnected();
}
/**
* Use the {@link #getActiveNetwork(Context)} method instead.
*/
@Nullable
@Deprecated
public static NetworkInfo getActiveNetwork()
{
Application context = MwmApplication.get();
if (context == null)
return null;
ConnectivityManager manager =
((ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE));
if (manager == null)
return null;
return manager.getActiveNetworkInfo();
}
@Nullable
public static NetworkInfo getActiveNetwork(@NonNull Context context)
{
ConnectivityManager manager =
((ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE));
if (manager == null)
return null;
return manager.getActiveNetworkInfo();
}
public static boolean isMobileConnected()
@ -125,7 +159,11 @@ public class ConnectionState
return requestCurrentType().getNativeRepresentation();
}
/**
* Use the {@link #requestCurrentType(Context)} method instead.
*/
@NonNull
@Deprecated
public static Type requestCurrentType()
{
for (ConnectionState.Type each : ConnectionState.Type.values())
@ -135,4 +173,15 @@ public class ConnectionState
}
return NONE;
}
@NonNull
public static Type requestCurrentType(@NonNull Context context)
{
for (ConnectionState.Type each : ConnectionState.Type.values())
{
if (isNetworkConnected(context, each.getPlatformRepresentation()))
return each;
}
return NONE;
}
}