From 062dd6211419186e7e104f3282fe7982a086aed4 Mon Sep 17 00:00:00 2001 From: Adeel Zafar Date: Wed, 7 Aug 2019 00:44:45 +0500 Subject: [PATCH] Remove demo server Remove WebServer.java Remove NanoHTTPD dependency --- app/build.gradle | 3 --- .../kiwixmobile/webserver/WebServer.java | 25 ----------------- .../webserver/WebServerHelper.java | 27 +++---------------- .../webserver/ZimHostActivity.java | 9 ++++++- 4 files changed, 11 insertions(+), 53 deletions(-) delete mode 100644 app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServer.java diff --git a/app/build.gradle b/app/build.gradle index 791d750cc..1c04183dc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -133,9 +133,6 @@ dependencies { implementation "io.objectbox:objectbox-kotlin:$objectboxVersion" implementation "io.objectbox:objectbox-rxjava:$objectboxVersion" - //NanoHTTPD - implementation 'org.nanohttpd:nanohttpd:2.3.1' - testImplementation "org.junit.jupiter:junit-jupiter:5.4.2" testImplementation "io.mockk:mockk:1.9" testImplementation "org.assertj:assertj-core:3.11.1" diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServer.java b/app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServer.java deleted file mode 100644 index 65b3a896d..000000000 --- a/app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServer.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.kiwix.kiwixmobile.webserver; - -import fi.iki.elonen.NanoHTTPD; -import java.util.Map; - -public class WebServer extends NanoHTTPD { - - public WebServer(int port) { - super(port); - } - - @Override - public Response serve(IHTTPSession session) { - String msg = "

Hello server

\n"; - Map parms = session.getParms(); - if (parms.get("username") == null) { - msg += - "
\n

Your name:

\n" - + "
\n"; - } else { - msg += "

Hello, " + parms.get("username") + "!

"; - } - return newFixedLengthResponse(msg + "\n"); - } -} diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServerHelper.java b/app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServerHelper.java index afab212e6..eccfd8815 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServerHelper.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServerHelper.java @@ -1,21 +1,14 @@ package org.kiwix.kiwixmobile.webserver; import android.content.Context; -import android.content.DialogInterface; -import android.text.InputFilter; -import android.text.InputType; import android.util.Log; import android.widget.EditText; -import android.widget.LinearLayout; import android.widget.TextView; -import androidx.appcompat.app.AlertDialog; import androidx.coordinatorlayout.widget.CoordinatorLayout; -import com.google.android.material.snackbar.Snackbar; import java.net.InetAddress; import java.net.NetworkInterface; import java.net.SocketException; import java.util.Enumeration; -import org.kiwix.kiwixmobile.R; /** * WebServerHelper class is used to set up the suitable environment i.e. getting the @@ -29,7 +22,6 @@ public class WebServerHelper { private EditText editTextPort; public static boolean isStarted; int port; - private static WebServer webServer; private CoordinatorLayout coordinatorLayout; ServerStateListener listener; @@ -52,8 +44,7 @@ public class WebServerHelper { public static boolean stopAndroidWebServer() { - if (isStarted && webServer != null) { - webServer.stop(); + if (isStarted ) { isStarted = false; return true; } @@ -63,26 +54,14 @@ public class WebServerHelper { boolean startAndroidWebServer() { if (!isStarted) { port = 8080; - try { - if (port == 0) { - throw new Exception(); - } - webServer = new WebServer(port); - webServer.start(); - return true; - } catch (Exception e) { - e.printStackTrace(); - Snackbar.make(coordinatorLayout, - "The PORT " + port + " doesn't work, please change it between 1000 and 9999.", - Snackbar.LENGTH_LONG).show(); - } + //Call to start server + return true; } return false; } // get Ip address of the device's wireless access point i.e. wifi hotspot OR wifi network String getIpAddress() { - Log.v("DANG", "Inside getIpAdress()"); String ip = ""; try { Enumeration enumNetworkInterfaces = NetworkInterface diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java index 1f6e367f3..4ba36967f 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java @@ -97,7 +97,14 @@ public class ZimHostActivity extends AppCompatActivity implements if (isMobileDataEnabled(context)) { mobileDataDialog(); } else { - startHotspotDialog(); + if(flag) { + serverStopped(); + isStarted = false; + } + else + { + startHotspotDialog(); + } } } }