From 4f0363d769696f86c5775de543830f29c69f4957 Mon Sep 17 00:00:00 2001
From: legikaloz <legikaloz@legiz.hu>
Date: Wed, 14 Nov 2012 21:47:54 +0100
Subject: [PATCH 1/3] Get Android network state by direct query or with intent

---
 src/src/org/renpy/android/Hardware.java | 50 +++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/src/org/renpy/android/Hardware.java b/src/src/org/renpy/android/Hardware.java
index 77577184cb..adfaec52fc 100644
--- a/src/src/org/renpy/android/Hardware.java
+++ b/src/src/org/renpy/android/Hardware.java
@@ -16,6 +16,8 @@
 import android.content.BroadcastReceiver;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 
 /**
  * Methods that are expected to be called via JNI, to access the
@@ -232,4 +234,52 @@ public static String scanWifi() {
         return "";
     }
 
+    /**
+     * network state, coarse
+     */
+
+    public static boolean network_state = false;
+
+    /**
+    * To recieve network state changes
+    */
+    public static void registerNetworkCheck()
+    {
+        IntentFilter i = new IntentFilter();
+        i.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+        context.registerReceiver(new BroadcastReceiver() {
+
+            @Override
+            public void onReceive(Context c, Intent i) {
+				checkNetwork();
+            }
+
+        }, i);
+    }
+
+
+    /**
+    * Check network state directly
+    *
+	* (only one connection can be active at a given moment, detects al type of networks)
+    *
+    */
+    public static boolean checkNetwork()
+    {
+        boolean state = false;
+        final ConnectivityManager conMgr =  (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+		final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo();
+		if (activeNetwork != null && activeNetwork.isConnected()) {
+			network_state = true;
+		} else {
+			network_state = false;
+		}
+
+        return state;
+    }
+
+
+
+
 }

From 725f423326d16d393941e75417abb6b0f5e6555e Mon Sep 17 00:00:00 2001
From: legikaloz <legikaloz@legiz.hu>
Date: Wed, 14 Nov 2012 22:20:15 +0100
Subject: [PATCH 2/3] code formatting

---
 src/src/org/renpy/android/Hardware.java | 36 +++++++++++--------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/src/org/renpy/android/Hardware.java b/src/src/org/renpy/android/Hardware.java
index adfaec52fc..982282eeb9 100644
--- a/src/src/org/renpy/android/Hardware.java
+++ b/src/src/org/renpy/android/Hardware.java
@@ -235,33 +235,15 @@ public static String scanWifi() {
     }
 
     /**
-     * network state, coarse
+     * network state
      */
 
     public static boolean network_state = false;
 
-    /**
-    * To recieve network state changes
-    */
-    public static void registerNetworkCheck()
-    {
-        IntentFilter i = new IntentFilter();
-        i.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
-        context.registerReceiver(new BroadcastReceiver() {
-
-            @Override
-            public void onReceive(Context c, Intent i) {
-				checkNetwork();
-            }
-
-        }, i);
-    }
-
-
     /**
     * Check network state directly
     *
-	* (only one connection can be active at a given moment, detects al type of networks)
+	* (only one connection can be active at a given moment, detects all network type)
     *
     */
     public static boolean checkNetwork()
@@ -279,7 +261,21 @@ public static boolean checkNetwork()
         return state;
     }
 
+    /**
+    * To recieve network state changes
+    */
+    public static void registerNetworkCheck()
+    {
+        IntentFilter i = new IntentFilter();
+        i.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+        context.registerReceiver(new BroadcastReceiver() {
 
+            @Override
+            public void onReceive(Context c, Intent i) {
+				checkNetwork();
+            }
 
+        }, i);
+    }
 
 }

From ebf5ce4cd22d325e1991d25d4df3c20ca3c4275e Mon Sep 17 00:00:00 2001
From: legikaloz <legikaloz@legiz.hu>
Date: Wed, 14 Nov 2012 22:29:15 +0100
Subject: [PATCH 3/3] Cleanup checkNetwork()

---
 src/src/org/renpy/android/Hardware.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/src/org/renpy/android/Hardware.java b/src/src/org/renpy/android/Hardware.java
index 982282eeb9..bc4493ee35 100644
--- a/src/src/org/renpy/android/Hardware.java
+++ b/src/src/org/renpy/android/Hardware.java
@@ -253,9 +253,9 @@ public static boolean checkNetwork()
 
 		final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo();
 		if (activeNetwork != null && activeNetwork.isConnected()) {
-			network_state = true;
+			state = true;
 		} else {
-			network_state = false;
+			state = false;
 		}
 
         return state;
@@ -272,7 +272,7 @@ public static void registerNetworkCheck()
 
             @Override
             public void onReceive(Context c, Intent i) {
-				checkNetwork();
+				network_state = checkNetwork();
             }
 
         }, i);