Skip to content

Add /kill stops sharing #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NWuensche wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add /kill stops sharing #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/src/main/java/com/jim/sharetocomputer/webserver/WebServerMultipleFiles.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ import android.net.Uri
import com.jim.sharetocomputer.FileInfo
import com.jim.sharetocomputer.Message
import com.jim.sharetocomputer.R
import com.jim.sharetocomputer.WebServerService
import com.jim.sharetocomputer.ext.getAppName
import com.jim.sharetocomputer.ext.getFileName
import com.jim.sharetocomputer.logging.MyLog
import com.jim.sharetocomputer.ui.main.MainActivity
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
Expand All @@ -36,6 +38,7 @@ import java.io.PipedOutputStream
import java.util.zip.Deflater
import java.util.zip.ZipEntry
import java.util.zip.ZipOutputStream
import kotlin.system.exitProcess

class WebServerMultipleFiles(private val context: Context, port: Int) : WebServer(port) {

Expand All @@ -56,6 +59,14 @@ class WebServerMultipleFiles(private val context: Context, port: Int) : WebServe
uris?.size ?: 0,
uris?.map { FileInfo(context.getFileName(it)) } ?: emptyList()
)
} else if (session.uri == "/kill") {
context.stopService(WebServerService.createIntent(context, null))
return newFixedLengthResponse(
Response.Status.OK,
"text/html",
InputStreamNotifyWebServer(ByteArrayInputStream("".toByteArray()), this),
-1
)
} else if (session.uri == "/zip") {
zipResponse()
} else if (session.uri.matches("/[0-9]+".toRegex())) {
Expand Down
12 changes: 11 additions & 1 deletion app/src/main/java/com/jim/sharetocomputer/webserver/WebServerSingleFile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ import android.content.Context
import android.net.Uri
import com.jim.sharetocomputer.FileInfo
import com.jim.sharetocomputer.Message
import com.jim.sharetocomputer.WebServerService
import com.jim.sharetocomputer.ext.getFileName
import com.jim.sharetocomputer.logging.MyLog
import java.io.ByteArrayInputStream

class WebServerSingleFile(private val context: Context, port: Int) : WebServer(port) {

Expand All @@ -44,6 +46,14 @@ class WebServerSingleFile(private val context: Context, port: Int) : WebServer(p
)
} else if (session.uri == "/info") {
return infoResponse(1, listOf(FileInfo(context.getFileName(uri!!))))
} else if (session.uri == "/kill") {
context.stopService(WebServerService.createIntent(context, null))
return newFixedLengthResponse(
Response.Status.OK,
"text/html",
InputStreamNotifyWebServer(ByteArrayInputStream("".toByteArray()), this),
-1
)
} else {
val fis = context.contentResolver.openInputStream(uri!!)
MyLog.d("*Response:$uri")
Expand All @@ -57,4 +67,4 @@ class WebServerSingleFile(private val context: Context, port: Int) : WebServer(p
}
}
}
}
}