yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

fixed possible NPE

Browse source
This commit is contained in:
Nikolay Pultsin 2014-07-28 04:58:21 +01:00
parent 92759bc5ec
commit 00a3438dc3
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/org/geometerplus/android/fbreader/synchroniser/SynchroniserService.java
View file

@ -62,8 +62,6 @@ public class SynchroniserService extends Service implements IBookCollection.List
} }
} }
private final ConnectivityManager myConnectivityManager =
(ConnectivityManager)getSystemService(CONNECTIVITY_SERVICE);
private final SyncOptions mySyncOptions = new SyncOptions(); private final SyncOptions mySyncOptions = new SyncOptions();
private static final class SyncronizationDisabledException extends RuntimeException { private static final class SyncronizationDisabledException extends RuntimeException {
@ -140,11 +138,23 @@ public class SynchroniserService extends Service implements IBookCollection.List
case never: case never:
return false; return false;
case always: case always:
return myConnectivityManager.getActiveNetworkInfo().isConnected(); {
final ConnectivityManager cm =
(ConnectivityManager)getSystemService(CONNECTIVITY_SERVICE);
return cm != null && cm.getActiveNetworkInfo().isConnected();
}
case viaWifi: case viaWifi:
{ {
final NetworkInfo info = myConnectivityManager.getActiveNetworkInfo(); final ConnectivityManager cm =
return info.isConnected() && info.getType() == ConnectivityManager.TYPE_WIFI; (ConnectivityManager)getSystemService(CONNECTIVITY_SERVICE);
if (cm == null) {
return false;
}
final NetworkInfo info = cm.getActiveNetworkInfo();
return
info != null &&
info.isConnected() &&
info.getType() == ConnectivityManager.TYPE_WIFI;
} }
} }
} }