diff --git a/.gitmodules b/.gitmodules index 7d39cfc6f..f4e70c3aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ path = extern/AndroidPinning url = http://gitlab.doeg.gy/cpu/androidpinning.git ignore = dirty +[submodule "extern/nanohttpd"] + path = extern/nanohttpd + url = https://github.com/eighthave/nanohttpd diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 86c0946fa..61014ce33 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -33,6 +33,7 @@ + @@ -181,6 +182,29 @@ + + + + + + + + + + + + + + + + + + + diff --git a/assets/index.template.html b/assets/index.template.html new file mode 100644 index 000000000..fe48db91f --- /dev/null +++ b/assets/index.template.html @@ -0,0 +1,65 @@ + + + + + {{REPO_URL}} local FDroid repo + + + + + + + + +

Kerplapp Bootstrap

+
    +
  1. Find a Kerplapp Repo
  2. +
  3. Download F-Droid client
  4. +
  5. Install F-Droid client
  6. +
  7. Add Kerplapp Repo to F-Droid client
  8. +
  9. Kerplapp an App!
  10. +
+ + diff --git a/extern/nanohttpd b/extern/nanohttpd new file mode 160000 index 000000000..58f73260e --- /dev/null +++ b/extern/nanohttpd @@ -0,0 +1 @@ +Subproject commit 58f73260ed98df878bae1051dc8e6a0bce842fcb diff --git a/libs/core-3.0.1.jar b/libs/core-3.0.1.jar new file mode 100644 index 000000000..d1b35fcbb Binary files /dev/null and b/libs/core-3.0.1.jar differ diff --git a/libs/core-3.0.1.jar.README b/libs/core-3.0.1.jar.README new file mode 100644 index 000000000..8535081d5 --- /dev/null +++ b/libs/core-3.0.1.jar.README @@ -0,0 +1,17 @@ +zxing +----- + +ZXing ("zebra crossing") is an open-source, multi-format 1D/2D barcode image +processing library implemented in Java, with ports to other languages. + +https://github.com/zxing/zxing + +Building zxing from scratch is a massive pain, so we use the official jar. +The main source repo is SVN, so we couldn't do a git submodule anyway. + +The releases should be signed by this key: +Sean Owen (ZXing) +CE32 85F3 2068 5193 D11F EA01 F6CE 9695 C931 8406 + +http://central.maven.org/maven2/com/google/zxing/core/3.0.1/core-3.0.1.jar +http://central.maven.org/maven2/com/google/zxing/core/3.0.1/core-3.0.1.jar.asc diff --git a/res/layout/local_repo_activity.xml b/res/layout/local_repo_activity.xml new file mode 100644 index 000000000..81ba324ca --- /dev/null +++ b/res/layout/local_repo_activity.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/qr_wizard_activity.xml b/res/layout/qr_wizard_activity.xml new file mode 100644 index 000000000..5d2fac14a --- /dev/null +++ b/res/layout/qr_wizard_activity.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + +