From 7c438cf32323a74f8119af22fa71a46a7d82099e Mon Sep 17 00:00:00 2001
From: nwuensche <Wuensche.Niklas@gmail.com>
Date: Thu, 28 Nov 2019 17:17:31 +0100
Subject: [PATCH] Show Logo as Favicon on Computer

---
 app/src/main/assets/web/favicon.ico           | Bin 0 -> 3580 bytes
 app/src/main/assets/web/main.html             |   1 +
 .../webserver/WebServerMultipleFiles.kt       |  18 ++++++++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 app/src/main/assets/web/favicon.ico

diff --git a/app/src/main/assets/web/favicon.ico b/app/src/main/assets/web/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8cfe66cff779029871bdad2ebc5699d9707f0393
GIT binary patch
literal 3580
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
Cyw;fj

literal 0
HcmV?d00001

diff --git a/app/src/main/assets/web/main.html b/app/src/main/assets/web/main.html
index 5da423e..a8f7319 100644
--- a/app/src/main/assets/web/main.html
+++ b/app/src/main/assets/web/main.html
@@ -1,6 +1,7 @@
 <html>
 <head>
     <title>[[title]]</title>
+    <link rel="icon" type="image/png" href="favicon">
     <style>
         *,*:after,*:before{box-sizing:inherit}html{box-sizing:border-box;font-size:62.5%}body{color:#606c76;font-family:'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;font-size:1.6em;font-weight:300;letter-spacing:.01em;line-height:1.6}blockquote{border-left:0.3rem solid #d1d1d1;margin-left:0;margin-right:0;padding:1rem 1.5rem}blockquote *:last-child{margin-bottom:0}.button,button,input[type='button'],input[type='reset'],input[type='submit']{background-color:#1B61EA;border:0.1rem solid #1B61EA;border-radius:.4rem;color:#fff;cursor:pointer;display:inline-block;font-size:1.1rem;font-weight:700;height:3.8rem;letter-spacing:.1rem;line-height:3.8rem;padding:0 3.0rem;text-align:center;text-decoration:none;text-transform:uppercase;white-space:nowrap}.button:focus,.button:hover,button:focus,button:hover,input[type='button']:focus,input[type='button']:hover,input[type='reset']:focus,input[type='reset']:hover,input[type='submit']:focus,input[type='submit']:hover{background-color:#606c76;border-color:#606c76;color:#fff;outline:0}.button[disabled],button[disabled],input[type='button'][disabled],input[type='reset'][disabled],input[type='submit'][disabled]{cursor:default;opacity:.5}.button[disabled]:focus,.button[disabled]:hover,button[disabled]:focus,button[disabled]:hover,input[type='button'][disabled]:focus,input[type='button'][disabled]:hover,input[type='reset'][disabled]:focus,input[type='reset'][disabled]:hover,input[type='submit'][disabled]:focus,input[type='submit'][disabled]:hover{background-color:#1B61EA;border-color:#1B61EA}.button.button-outline,button.button-outline,input[type='button'].button-outline,input[type='reset'].button-outline,input[type='submit'].button-outline{background-color:transparent;color:#1B61EA}.button.button-outline:focus,.button.button-outline:hover,button.button-outline:focus,button.button-outline:hover,input[type='button'].button-outline:focus,input[type='button'].button-outline:hover,input[type='reset'].button-outline:focus,input[type='reset'].button-outline:hover,input[type='submit'].button-outline:focus,input[type='submit'].button-outline:hover{background-color:transparent;border-color:#606c76;color:#606c76}.button.button-outline[disabled]:focus,.button.button-outline[disabled]:hover,button.button-outline[disabled]:focus,button.button-outline[disabled]:hover,input[type='button'].button-outline[disabled]:focus,input[type='button'].button-outline[disabled]:hover,input[type='reset'].button-outline[disabled]:focus,input[type='reset'].button-outline[disabled]:hover,input[type='submit'].button-outline[disabled]:focus,input[type='submit'].button-outline[disabled]:hover{border-color:inherit;color:#1B61EA}.button.button-clear,button.button-clear,input[type='button'].button-clear,input[type='reset'].button-clear,input[type='submit'].button-clear{background-color:transparent;border-color:transparent;color:#1B61EA}.button.button-clear:focus,.button.button-clear:hover,button.button-clear:focus,button.button-clear:hover,input[type='button'].button-clear:focus,input[type='button'].button-clear:hover,input[type='reset'].button-clear:focus,input[type='reset'].button-clear:hover,input[type='submit'].button-clear:focus,input[type='submit'].button-clear:hover{background-color:transparent;border-color:transparent;color:#606c76}.button.button-clear[disabled]:focus,.button.button-clear[disabled]:hover,button.button-clear[disabled]:focus,button.button-clear[disabled]:hover,input[type='button'].button-clear[disabled]:focus,input[type='button'].button-clear[disabled]:hover,input[type='reset'].button-clear[disabled]:focus,input[type='reset'].button-clear[disabled]:hover,input[type='submit'].button-clear[disabled]:focus,input[type='submit'].button-clear[disabled]:hover{color:#1B61EA}code{background:#f4f5f6;border-radius:.4rem;font-size:86%;margin:0 .2rem;padding:.2rem .5rem;white-space:nowrap}pre{background:#f4f5f6;border-left:0.3rem solid #1B61EA;overflow-y:hidden}pre>code{border-radius:0;display:block;padding:1rem 1.5rem;white-space:pre}hr{border:0;border-top:0.1rem solid #f4f5f6;margin:3.0rem 0}input[type='email'],input[type='number'],input[type='password'],input[type='search'],input[type='tel'],input[type='text'],input[type='url'],input[type='color'],input[type='date'],input[type='month'],input[type='week'],input[type='datetime'],input[type='datetime-local'],input:not([type]),textarea,select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:transparent;border:0.1rem solid #d1d1d1;border-radius:.4rem;box-shadow:none;box-sizing:inherit;height:3.8rem;padding:.6rem 1.0rem;width:100%}input[type='email']:focus,input[type='number']:focus,input[type='password']:focus,input[type='search']:focus,input[type='tel']:focus,input[type='text']:focus,input[type='url']:focus,input[type='color']:focus,input[type='date']:focus,input[type='month']:focus,input[type='week']:focus,input[type='datetime']:focus,input[type='datetime-local']:focus,input:not([type]):focus,textarea:focus,select:focus{border-color:#1B61EA;outline:0}select{background:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="14" viewBox="0 0 29 14" width="29"><path fill="%23d1d1d1" d="M9.37727 3.625l5.08154 6.93523L19.54036 3.625"/></svg>') center right no-repeat;padding-right:3.0rem}select:focus{background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="14" viewBox="0 0 29 14" width="29"><path fill="%231B61EA" d="M9.37727 3.625l5.08154 6.93523L19.54036 3.625"/></svg>')}textarea{min-height:6.5rem}label,legend{display:block;font-size:1.6rem;font-weight:700;margin-bottom:.5rem}fieldset{border-width:0;padding:0}input[type='checkbox'],input[type='radio']{display:inline}.label-inline{display:inline-block;font-weight:normal;margin-left:.5rem}.container{margin:0 auto;max-width:112.0rem;padding:0 2.0rem;position:relative;width:100%}.row{display:flex;flex-direction:column;padding:0;width:100%}.row.row-no-padding{padding:0}.row.row-no-padding>.column{padding:0}.row.row-wrap{flex-wrap:wrap}.row.row-top{align-items:flex-start}.row.row-bottom{align-items:flex-end}.row.row-center{align-items:center}.row.row-stretch{align-items:stretch}.row.row-baseline{align-items:baseline}.row .column{display:block;flex:1 1 auto;margin-left:0;max-width:100%;width:100%}.row .column.column-offset-10{margin-left:10%}.row .column.column-offset-20{margin-left:20%}.row .column.column-offset-25{margin-left:25%}.row .column.column-offset-33,.row .column.column-offset-34{margin-left:33.3333%}.row .column.column-offset-50{margin-left:50%}.row .column.column-offset-66,.row .column.column-offset-67{margin-left:66.6666%}.row .column.column-offset-75{margin-left:75%}.row .column.column-offset-80{margin-left:80%}.row .column.column-offset-90{margin-left:90%}.row .column.column-10{flex:0 0 10%;max-width:10%}.row .column.column-20{flex:0 0 20%;max-width:20%}.row .column.column-25{flex:0 0 25%;max-width:25%}.row .column.column-33,.row .column.column-34{flex:0 0 33.3333%;max-width:33.3333%}.row .column.column-40{flex:0 0 40%;max-width:40%}.row .column.column-50{flex:0 0 50%;max-width:50%}.row .column.column-60{flex:0 0 60%;max-width:60%}.row .column.column-66,.row .column.column-67{flex:0 0 66.6666%;max-width:66.6666%}.row .column.column-75{flex:0 0 75%;max-width:75%}.row .column.column-80{flex:0 0 80%;max-width:80%}.row .column.column-90{flex:0 0 90%;max-width:90%}.row .column .column-top{align-self:flex-start}.row .column .column-bottom{align-self:flex-end}.row .column .column-center{-ms-grid-row-align:center;align-self:center}@media (min-width: 40rem){.row{flex-direction:row;margin-left:-1.0rem;width:calc(100% + 2.0rem)}.row .column{margin-bottom:inherit;padding:0 1.0rem}}a{color:#1B61EA;text-decoration:none}a:focus,a:hover{color:#606c76}dl,ol,ul{list-style:none;margin-top:0;padding-left:0}dl dl,dl ol,dl ul,ol dl,ol ol,ol ul,ul dl,ul ol,ul ul{font-size:90%;margin:1.5rem 0 1.5rem 3.0rem}ol{list-style:decimal inside}ul{list-style:circle inside}.button,button,dd,dt,li{margin-bottom:1.0rem}fieldset,input,select,textarea{margin-bottom:1.5rem}blockquote,dl,figure,form,ol,p,pre,table,ul{margin-bottom:2.5rem}table{border-spacing:0;width:100%}td,th{border-bottom:0.1rem solid #e1e1e1;padding:1.2rem 1.5rem;text-align:left}td:first-child,th:first-child{padding-left:0}td:last-child,th:last-child{padding-right:0}b,strong{font-weight:bold}p{margin-top:0}h1,h2,h3,h4,h5,h6{font-weight:300;letter-spacing:-.1rem;margin-bottom:2.0rem;margin-top:0}h1{font-size:4.6rem;line-height:1.2}h2{font-size:3.6rem;line-height:1.25}h3{font-size:2.8rem;line-height:1.3}h4{font-size:2.2rem;letter-spacing:-.08rem;line-height:1.35}h5{font-size:1.8rem;letter-spacing:-.05rem;line-height:1.5}h6{font-size:1.6rem;letter-spacing:0;line-height:1.4}img{max-width:100%}.clearfix:after{clear:both;content:' ';display:table}.float-left{float:left}.float-right{float:right}
 
diff --git a/app/src/main/java/com/jim/sharetocomputer/webserver/WebServerMultipleFiles.kt b/app/src/main/java/com/jim/sharetocomputer/webserver/WebServerMultipleFiles.kt
index 6b81050..e916cb1 100644
--- a/app/src/main/java/com/jim/sharetocomputer/webserver/WebServerMultipleFiles.kt
+++ b/app/src/main/java/com/jim/sharetocomputer/webserver/WebServerMultipleFiles.kt
@@ -36,6 +36,7 @@ import java.io.PipedOutputStream
 import java.util.zip.Deflater
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
+import android.content.res.AssetManager
 
 class WebServerMultipleFiles(private val context: Context, port: Int) : WebServer(port) {
 
@@ -58,6 +59,8 @@ class WebServerMultipleFiles(private val context: Context, port: Int) : WebServe
                 )
             } else if (session.uri == "/zip") {
                 zipResponse()
+            } else if (session.uri == "/favicon") {
+                faviconResponse()
             } else if (session.uri.matches("/[0-9]+".toRegex())) {
                 val index = session.uri.split("/")[1].toInt()
                 require(index < uris!!.size)
@@ -112,6 +115,21 @@ class WebServerMultipleFiles(private val context: Context, port: Int) : WebServe
         }
     }
 
+    private fun faviconResponse(): Response {
+        val mgr = this.context.assets
+        val filename = "web/favicon.ico"
+        val fis = mgr.open(filename, AssetManager.ACCESS_BUFFER)
+
+        return newFixedLengthResponse(
+            Response.Status.OK,
+            null,
+            InputStreamNotifyWebServer(fis, this),
+            -1
+        ).apply {
+            addHeader("Content-Disposition", "filename=\"$filename\"")
+        }
+    }
+
     private fun contentUriResponse(uri: Uri): Response {
         val fis = context.contentResolver.openInputStream(uri)
         return newFixedLengthResponse(