Merge pull request #621 from couchbase/feature/issue_636_networkreachability

Fixed Java Core 636: Exel: Push replication "losing" documents create…

Author: pasin

src/main/AndroidManifest.xml

@@ -1,7 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.couchbase.lite">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application />
 

src/main/java/com/couchbase/lite/android/AndroidNetworkReachabilityManager.java

@@ -4,44 +4,23 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 
-import com.couchbase.lite.Context;
 import com.couchbase.lite.NetworkReachabilityManager;
 import com.couchbase.lite.util.Log;
 
 public class AndroidNetworkReachabilityManager extends NetworkReachabilityManager {
 
-    private Context context;
     private boolean listening;
     private android.content.Context wrappedContext;
     private ConnectivityBroadcastReceiver receiver;
-    private State state;
 
-    public enum State {
-        UNKNOWN,
-
-        /** This state is returned if there is connectivity to any network **/
-        CONNECTED,
-        /**
-         * This state is returned if there is no connectivity to any network. This is set to true
-         * under two circumstances:
-         * <ul>
-         * <li>When connectivity is lost to one network, and there is no other available network to
-         * attempt to switch to.</li>
-         * <li>When connectivity is lost to one network, and the attempt to switch to another
-         * network fails.</li>
-         */
-        NOT_CONNECTED
-    }
-
-    public AndroidNetworkReachabilityManager(AndroidContext context) {
-        this.context = context;
-        this.wrappedContext = context.getWrappedContext();
+    public AndroidNetworkReachabilityManager(AndroidContext androidContextcontext) {
+        this.listening = false;
+        this.wrappedContext = androidContextcontext.getWrappedContext();
         this.receiver = new ConnectivityBroadcastReceiver();
-        this.state = State.UNKNOWN;
     }
 
-
     public synchronized void startListening() {
         if (!listening) {
             IntentFilter filter = new IntentFilter();
@@ -60,38 +39,32 @@ public synchronized void stopListening() {
             } catch (Exception e) {
                 Log.e(Log.TAG_SYNC, "%s: stopListening() exception unregistering %s with context %s", e, this, receiver, wrappedContext);
             }
-            context = null;
             listening = false;
         }
     }
 
     private class ConnectivityBroadcastReceiver extends BroadcastReceiver {
-
         @Override
         public void onReceive(android.content.Context context, Intent intent) {
             String action = intent.getAction();
-
             if (!action.equals(ConnectivityManager.CONNECTIVITY_ACTION) || listening == false) {
                 return;
             }
 
-            boolean noConnectivity = intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false);
+            boolean bOnline = isOnline(context);
+            Log.v(Log.TAG_SYNC, "BroadcastReceiver.onReceive() bOnline=" + bOnline);
 
-            if (noConnectivity) {
-                state = State.NOT_CONNECTED;
+            if (bOnline) {
+                notifyListenersNetworkReachable();
             } else {
-                state = State.CONNECTED;
-            }
-
-            if (state == State.NOT_CONNECTED) {
                 notifyListenersNetworkUneachable();
             }
-
-            if (state == State.CONNECTED) {
-                notifyListenersNetworkReachable();
-            }
-
         }
-    };
+    }
 
+    private boolean isOnline(android.content.Context context) {
+        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(android.content.Context.CONNECTIVITY_SERVICE);
+        NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
+        return activeNetwork != null && activeNetwork.isConnected();
+    }
 }