From bef9d66ffed6c1c52d5ee6df578ddf669730218d Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 23 Aug 2014 01:45:24 +0000
Subject: [PATCH] Add support for testing network connection

---
 .gitattributes                                |  1 +
 forge-gui-android/AndroidManifest.xml         |  3 ++-
 forge-gui-android/src/forge/app/Main.java     | 23 ++++++++++++++++++-
 forge-gui-mobile-dev/src/forge/app/Main.java  | 18 +++++++++++++--
 forge-gui-mobile/src/forge/Forge.java         |  9 +++++++-
 .../forge/interfaces/INetworkConnection.java  |  6 +++++
 6 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 forge-gui/src/main/java/forge/interfaces/INetworkConnection.java

diff --git a/.gitattributes b/.gitattributes
index 59638709f87..f8556e9a7e1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -16674,6 +16674,7 @@ forge-gui/src/main/java/forge/interfaces/IButton.java -text
 forge-gui/src/main/java/forge/interfaces/ICheckBox.java -text
 forge-gui/src/main/java/forge/interfaces/IComboBox.java -text
 forge-gui/src/main/java/forge/interfaces/IGuiBase.java -text
+forge-gui/src/main/java/forge/interfaces/INetworkConnection.java -text
 forge-gui/src/main/java/forge/interfaces/IProgressBar.java -text
 forge-gui/src/main/java/forge/interfaces/ITextField.java -text
 forge-gui/src/main/java/forge/interfaces/IWinLoseView.java -text
diff --git a/forge-gui-android/AndroidManifest.xml b/forge-gui-android/AndroidManifest.xml
index e8361819811..d100064afdf 100644
--- a/forge-gui-android/AndroidManifest.xml
+++ b/forge-gui-android/AndroidManifest.xml
@@ -9,7 +9,8 @@
         android:targetSdkVersion="19" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
         android:allowBackup="true"
diff --git a/forge-gui-android/src/forge/app/Main.java b/forge-gui-android/src/forge/app/Main.java
index 191c329bb40..2da6d49f108 100644
--- a/forge-gui-android/src/forge/app/Main.java
+++ b/forge-gui-android/src/forge/app/Main.java
@@ -2,7 +2,10 @@ package forge.app;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
+import android.content.Context;
 import android.content.pm.ActivityInfo;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
@@ -11,6 +14,7 @@ import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.backends.android.AndroidApplication;
 
 import forge.Forge;
+import forge.interfaces.INetworkConnection;
 import forge.util.FileUtil;
 
 public class Main extends AndroidApplication {
@@ -37,7 +41,8 @@ public class Main extends AndroidApplication {
             return;
         }
 
-        initialize(Forge.getApp(new AndroidClipboard(), assetsDir, new Runnable() {
+        initialize(Forge.getApp(new AndroidClipboard(), new AndroidNetworkConnection(),
+                assetsDir, new Runnable() {
             @Override
             public void run() {
                 //ensure process doesn't stick around after exiting
@@ -68,4 +73,20 @@ public class Main extends AndroidApplication {
             cm.setPrimaryClip(ClipData.newPlainText("Forge", contents0));
         }
     }
+
+    private class AndroidNetworkConnection implements INetworkConnection {
+        private final ConnectivityManager connManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        @Override
+        public boolean isConnected() {
+            NetworkInfo activeNetworkInfo = connManager.getActiveNetworkInfo();
+            return activeNetworkInfo != null && activeNetworkInfo.isConnected();
+        }
+
+        @Override
+        public boolean isConnectedToWifi() {
+            NetworkInfo wifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+            return wifi.isConnected();
+        }
+    }
 }
diff --git a/forge-gui-mobile-dev/src/forge/app/Main.java b/forge-gui-mobile-dev/src/forge/app/Main.java
index 81b1a1e9adb..00eb19309a7 100644
--- a/forge-gui-mobile-dev/src/forge/app/Main.java
+++ b/forge-gui-mobile-dev/src/forge/app/Main.java
@@ -4,11 +4,25 @@ import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 import com.badlogic.gdx.backends.lwjgl.LwjglClipboard;
 
 import forge.Forge;
+import forge.interfaces.INetworkConnection;
 import forge.util.Utils;
 
 public class Main {
     public static void main(String[] args) {
-        new LwjglApplication(Forge.getApp(new LwjglClipboard(), "../forge-gui/", null),
-                "Forge", Utils.DEV_SCREEN_WIDTH, Utils.DEV_SCREEN_HEIGHT);
+        new LwjglApplication(Forge.getApp(new LwjglClipboard(), new DesktopNetworkConnection(),
+                "../forge-gui/", null), "Forge", Utils.DEV_SCREEN_WIDTH, Utils.DEV_SCREEN_HEIGHT);
+    }
+
+    private static class DesktopNetworkConnection implements INetworkConnection {
+        //just assume desktop always connected to wifi
+        @Override
+        public boolean isConnected() {
+            return true;
+        }
+
+        @Override
+        public boolean isConnectedToWifi() {
+            return true;
+        }
     }
 }
diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index 675f8827b0e..f1b3d90f4b6 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -16,6 +16,7 @@ import forge.assets.FSkinFont;
 import forge.assets.ImageCache;
 import forge.error.BugReporter;
 import forge.error.ExceptionHandler;
+import forge.interfaces.INetworkConnection;
 import forge.model.FModel;
 import forge.properties.ForgeConstants;
 import forge.properties.ForgePreferences;
@@ -40,6 +41,7 @@ public class Forge implements ApplicationListener {
 
     private static final ApplicationListener app = new Forge();
     private static Clipboard clipboard;
+    private static INetworkConnection networkConnection;
     private static Runnable onExit;
     private static int screenWidth;
     private static int screenHeight;
@@ -50,9 +52,10 @@ public class Forge implements ApplicationListener {
     private static final SoundSystem soundSystem = new SoundSystem();
     private static final Stack<FScreen> screens = new Stack<FScreen>();
 
-    public static ApplicationListener getApp(Clipboard clipboard0, String assetDir0, Runnable onExit0) {
+    public static ApplicationListener getApp(Clipboard clipboard0, INetworkConnection networkConnection0, String assetDir0, Runnable onExit0) {
         if (GuiBase.getInterface() == null) {
             clipboard = clipboard0;
+            networkConnection = networkConnection0;
             onExit = onExit0;
             GuiBase.setInterface(new GuiMobile(assetDir0));
         }
@@ -121,6 +124,10 @@ public class Forge implements ApplicationListener {
         return clipboard;
     }
 
+    public static INetworkConnection getNetworkConnection() {
+        return networkConnection;
+    }
+
     public static void showMenu() {
         if (currentScreen == null) { return; }
         endKeyInput(); //end key input before menu shown
diff --git a/forge-gui/src/main/java/forge/interfaces/INetworkConnection.java b/forge-gui/src/main/java/forge/interfaces/INetworkConnection.java
new file mode 100644
index 00000000000..bf3a47c8aea
--- /dev/null
+++ b/forge-gui/src/main/java/forge/interfaces/INetworkConnection.java
@@ -0,0 +1,6 @@
+package forge.interfaces;
+
+public interface INetworkConnection {
+    boolean isConnected();
+    boolean isConnectedToWifi();
+}