kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-24 21:45:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove demo server

Browse Source 
Remove WebServer.java
Remove NanoHTTPD dependency
This commit is contained in:
Adeel Zafar 2019-08-07 00:44:45 +05:00
parent d6a43b452d
commit 062dd62114
4 changed files with 11 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -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"

25
app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServer.java
View File

@ -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 = "<html><body><h1>Hello server</h1>\n";
Map<String, String> parms = session.getParms();
if (parms.get("username") == null) {
msg +=
"<form action='?' method='get'>\n <p>Your name: <input type='text' name='username'></p>\n"
+ "</form>\n";
} else {
msg += "<p>Hello, " + parms.get("username") + "!</p>";
}
return newFixedLengthResponse(msg + "</body></html>\n");
}
}

27
app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServerHelper.java
View File

@ -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<NetworkInterface> enumNetworkInterfaces = NetworkInterface

9
app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java
View File

@ -97,7 +97,14 @@ public class ZimHostActivity extends AppCompatActivity implements
if (isMobileDataEnabled(context)) {
mobileDataDialog();
} else {
startHotspotDialog();
if(flag) {
serverStopped();
isStarted = false;
}
else
{
startHotspotDialog();
}
}
}
}