Update fork description and readme (fixes #99) (#120)

* Update fork description and readme

* Update F-Droid metadata and description

* Remove blank line

README.md

@@ -21,9 +21,9 @@ See https://github.com/Catfriend1/syncthing-android/issues/122 for more details
 
 # Goal of the forked version
 - Develop and try out enhancements together
-- Release the wrapper more frequently to identify and fix bugs together caused by changes in the syncthing submodule.
+- Release the wrapper more frequently to identify and fix bugs together caused by changes in the syncthing submodule
 - Make enhancements configurable in the settings UI, e.g. users should be able to turn them on and off
-- Let's get ready for newer Android versions that put limits on background syncing tools. We need your bug reports as detailed as possible.
+- Let's get ready for newer Android versions that put limits on background syncing tools. We need your bug reports as detailed as possible
 
 # Translations
 

fdroiddata/metadata/com.github.catfriend1.syncthingandroid.yml

@@ -11,17 +11,25 @@ Summary: File synchronization
 Description: |-
     This is a fork of [[com.nutomic.syncthingandroid]] that brings major
     enhancements like:
-    * UI explains why syncthing is running or not running according to the run
+    * Individual sync conditions can be applied per device and per folder
-    conditions set in preferences.
+    * Recent changes UI, click to open files.
-    * A welcome wizard guiding you through initial setup on first launch or if
-    mandatory prerequisites are missing like for example the storage permission.
-    * Run condition bugs are fixed.
     * "Battery eater" problem is fixed.
-    * Android 8+ support is on it's way.
+    * Android 8 and 9 support.
     Syncthing replaces proprietary sync and cloud services with something open,
     trustworthy and decentralized. Your data is your data alone and you deserve to
     choose where it is stored, if it is shared with some third party and how it's
-    transmitted over the Internet.
+    transmitted over the Internet. Syncthing-Fork for Android is a wrapper for
+    Syncthing that provides an Android UI instead of Syncthing's built-in Web UI.
+    Goals of the fork:
+    * Develop and try out enhancements together with the community.
+    * Release the wrapper more frequently to identify and fix bugs caused by changes in the syncthing submodule
+    * Make enhancements configurable in the UI, users should be able to turn them on and off
+    Comparison between upstream and fork at the time of writing this:
+    * Both contain the syncthing binary built from the official source at GitHub:syncthing/syncthing
+    * Syncing functionality and reliability depends on the syncthing binary submodule version.
+    * Fork gets along with upstream and sometimes they pick up my improvements.
+    * Strategy and release frequency is different
+    * Only the wrapper containing the Android UI is addressed by the fork.
 
 RepoType: git
 Repo: https://github.com/Catfriend1/syncthing-android.git
@@ -44,7 +52,279 @@ Builds:
         PATH="$PWD/go/bin:$PATH" gradle buildNative
     ndk: r15c
 
+  - versionName: 0.14.51.rc2.1
+    versionCode: 4156
+    commit: v0.14.51.rc2.1
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.rc3.2
+    versionCode: 4158
+    commit: v0.14.51.rc3.2
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.rc3.4
+    versionCode: 4160
+    commit: v0.14.51.rc3.4
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.rc3.5
+    versionCode: 4161
+    commit: v0.14.51.rc3.5
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.rc4.1
+    versionCode: 4163
+    commit: v0.14.51.rc4.1
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.1
+    versionCode: 4164
+    commit: v0.14.51.1
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.3
+    versionCode: 4166
+    commit: v0.14.51.3
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.4
+    versionCode: 4167
+    commit: v0.14.51.4
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.5
+    versionCode: 4168
+    commit: v0.14.51.5
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.6
+    versionCode: 4169
+    commit: v0.14.51.6
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.7
+    versionCode: 4170
+    commit: v0.14.51.7
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.8
+    versionCode: 4171
+    commit: v0.14.51.8
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.10
+    versionCode: 4173
+    commit: v0.14.51.10
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.12
+    versionCode: 4175
+    commit: v0.14.51.12
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.51.13
+    versionCode: 4176
+    commit: v0.14.51.13
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
+  - versionName: 0.14.52.1
+    versionCode: 4177
+    commit: v0.14.52.1
+    submodules: true
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
+    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    build: |-
+        wget -O go.tgz https://dl.google.com/go/go1.9.7.linux-amd64.tar.gz && \
+        echo '88573008f4f6233b81f81d8ccf92234b4f67238df0f0ab173d75a302a1f3d6ee  go.tgz' | shasum -c - && \
+        tar xf go.tgz && \
+        PATH="$PWD/go/bin:$PATH" gradle buildNative
+    ndk: r15c
+
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags ^v[a-z0-9.]*$
-CurrentVersion: 0.14.50.rc2.6
+CurrentVersion: 0.14.52.1
-CurrentVersionCode: 4154
+CurrentVersionCode: 4177