add infos about F-Droid on dl.bitmask.net

3 files changed, 60 insertions, 6 deletions

diff --git a/public/android/index.en.html b/public/android/index.en.html
index 268649a..d3fd4ab 100644
--- a/public/android/index.en.html
+++ b/public/android/index.en.html
@@ -33,6 +33,17 @@ Bitmask Downloads
     </ol>
   </li>
   <li>
+    <a href="#install-from-f-droid">Install from F-Droid</a>
+    <ol>
+      <li>
+        <a href="#stable-version-2">Stable version</a>
+      </li>
+      <li>
+        <a href="#beta-version-2">Beta version</a>
+      </li>
+    </ol>
+  </li>
+  <li>
     <a href="#download-other-versions">Download other versions</a>
   </li>
 </ol></div>
@@ -69,7 +80,8 @@ Bitmask Downloads
 </p>
 <p class="non-android"><a href="https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk"><img src="/assets/qr/dl.bitmask.net-bitmask-android-latest.png" alt="" /></a></p>
 <h3><a name="beta-version"></a>Beta version</h3>
-<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/android/beta/Bitmask-Android-0.9.7-rc1.apk'>
+<p>You can install Bitmask Beta next to the stable release on the same device.</p>
+<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/android/beta/Bitmask-Android-testing.apk'>
   <i class='fa fa-cloud-download fa-lg'></i>
   Download for Android
 </a>
@@ -78,11 +90,17 @@ Bitmask Downloads
   <div class='col-sm-8 col-sm-offset-2'>
     <div class='p alert alert-danger'>
       <i class='fa fa-warning'></i>
-      <b>ATTENTION:</b> Please <a href="https://dl.bitmask.net/en/signature-verification">verify</a> the signature!</p>
+      <b>ATTENTION:</b> Please <a href="https://dl.bitmask.net/en/signature-verification">verify</a> the <a href="https://dl.bitmask.net/client/android/Bitmask-Android-testing.apk.sig">signature</a>!</p>
     </div>
   </div>
 </div>
 </p>
+<h2><a name="install-from-f-droid"></a>Install from F-Droid</h2>
+<h3><a name="stable-version-2"></a>Stable version</h3>
+<p>We are currently integrating Bitmask to the official F-Droid repository and it will be available there soon!<br />
+<a href="https://f-droid.org/">F-Droid</a> is an alternative app store for open-source and privacy-aware Android apps.</p>
+<h3><a name="beta-version-2"></a>Beta version</h3>
+<p>You can get Bitmask Beta from <a href="https://apt.izzysoft.de/fdroid/index/">IzzySoft&#8217;s F-Droid repository</a>.</p>
 <h2><a name="download-other-versions"></a>Download other versions</h2>
 <p>If you want to install an old version of Bitmask, you can <a href="https://dl.bitmask.net/client/android/">browse all releases</a>.</p>
 <p>If you want to see the latest features and bug fixes and would like to contribute to Bitmask by testing the app, you can join <a href="https://play.google.com/apps/testing/se.leap.bitmaskclient">Google&#8217;s Beta-Channel for Bitmask</a>. The pre-releases can be found <a href="https://play.google.com/store/apps/details?id=se.leap.bitmaskclient">here</a>.</p>
diff --git a/public/android/index.es.html b/public/android/index.es.html
index 519b8da..8585ad2 100644
--- a/public/android/index.es.html
+++ b/public/android/index.es.html
@@ -33,6 +33,17 @@ Bitmask Downloads
     </ol>
   </li>
   <li>
+    <a href="#install-from-f-droid">Install from F-Droid</a>
+    <ol>
+      <li>
+        <a href="#stable-version-2">Stable version</a>
+      </li>
+      <li>
+        <a href="#beta-version-2">Beta version</a>
+      </li>
+    </ol>
+  </li>
+  <li>
     <a href="#download-other-versions">Download other versions</a>
   </li>
 </ol></div>
@@ -69,7 +80,8 @@ Bitmask Downloads
 </p>
 <p class="non-android"><a href="https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk"><img src="/assets/qr/dl.bitmask.net-bitmask-android-latest.png" alt="" /></a></p>
 <h3><a name="beta-version"></a>Beta version</h3>
-<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/android/beta/Bitmask-Android-0.9.7-rc1.apk'>
+<p>You can install Bitmask Beta next to the stable release on the same device.</p>
+<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/android/beta/Bitmask-Android-testing.apk'>
   <i class='fa fa-cloud-download fa-lg'></i>
   Download for Android
 </a>
@@ -78,11 +90,17 @@ Bitmask Downloads
   <div class='col-sm-8 col-sm-offset-2'>
     <div class='p alert alert-danger'>
       <i class='fa fa-warning'></i>
-      <b>ATTENTION:</b> Please <a href="https://dl.bitmask.net/en/signature-verification">verify</a> the signature!</p>
+      <b>ATTENTION:</b> Please <a href="https://dl.bitmask.net/en/signature-verification">verify</a> the <a href="https://dl.bitmask.net/client/android/Bitmask-Android-testing.apk.sig">signature</a>!</p>
     </div>
   </div>
 </div>
 </p>
+<h2><a name="install-from-f-droid"></a>Install from F-Droid</h2>
+<h3><a name="stable-version-2"></a>Stable version</h3>
+<p>We are currently integrating Bitmask to the official F-Droid repository and it will be available there soon!<br />
+<a href="https://f-droid.org/">F-Droid</a> is an alternative app store for open-source and privacy-aware Android apps.</p>
+<h3><a name="beta-version-2"></a>Beta version</h3>
+<p>You can get Bitmask Beta from <a href="https://apt.izzysoft.de/fdroid/index/">IzzySoft&#8217;s F-Droid repository</a>.</p>
 <h2><a name="download-other-versions"></a>Download other versions</h2>
 <p>If you want to install an old version of Bitmask, you can <a href="https://dl.bitmask.net/client/android/">browse all releases</a>.</p>
 <p>If you want to see the latest features and bug fixes and would like to contribute to Bitmask by testing the app, you can join <a href="https://play.google.com/apps/testing/se.leap.bitmaskclient">Google&#8217;s Beta-Channel for Bitmask</a>. The pre-releases can be found <a href="https://play.google.com/store/apps/details?id=se.leap.bitmaskclient">here</a>.</p>
diff --git a/public/android/index.pt.html b/public/android/index.pt.html
index 3c858c1..2e898b8 100644
--- a/public/android/index.pt.html
+++ b/public/android/index.pt.html
@@ -33,6 +33,17 @@ Bitmask Downloads
     </ol>
   </li>
   <li>
+    <a href="#install-from-f-droid">Install from F-Droid</a>
+    <ol>
+      <li>
+        <a href="#stable-version-2">Stable version</a>
+      </li>
+      <li>
+        <a href="#beta-version-2">Beta version</a>
+      </li>
+    </ol>
+  </li>
+  <li>
     <a href="#download-other-versions">Download other versions</a>
   </li>
 </ol></div>
@@ -69,7 +80,8 @@ Bitmask Downloads
 </p>
 <p class="non-android"><a href="https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk"><img src="/assets/qr/dl.bitmask.net-bitmask-android-latest.png" alt="" /></a></p>
 <h3><a name="beta-version"></a>Beta version</h3>
-<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/android/beta/Bitmask-Android-0.9.7-rc1.apk'>
+<p>You can install Bitmask Beta next to the stable release on the same device.</p>
+<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/android/beta/Bitmask-Android-testing.apk'>
   <i class='fa fa-cloud-download fa-lg'></i>
   Download for Android
 </a>
@@ -78,11 +90,17 @@ Bitmask Downloads
   <div class='col-sm-8 col-sm-offset-2'>
     <div class='p alert alert-danger'>
       <i class='fa fa-warning'></i>
-      <b>ATTENTION:</b> Please <a href="https://dl.bitmask.net/en/signature-verification">verify</a> the signature!</p>
+      <b>ATTENTION:</b> Please <a href="https://dl.bitmask.net/en/signature-verification">verify</a> the <a href="https://dl.bitmask.net/client/android/Bitmask-Android-testing.apk.sig">signature</a>!</p>
     </div>
   </div>
 </div>
 </p>
+<h2><a name="install-from-f-droid"></a>Install from F-Droid</h2>
+<h3><a name="stable-version-2"></a>Stable version</h3>
+<p>We are currently integrating Bitmask to the official F-Droid repository and it will be available there soon!<br />
+<a href="https://f-droid.org/">F-Droid</a> is an alternative app store for open-source and privacy-aware Android apps.</p>
+<h3><a name="beta-version-2"></a>Beta version</h3>
+<p>You can get Bitmask Beta from <a href="https://apt.izzysoft.de/fdroid/index/">IzzySoft&#8217;s F-Droid repository</a>.</p>
 <h2><a name="download-other-versions"></a>Download other versions</h2>
 <p>If you want to install an old version of Bitmask, you can <a href="https://dl.bitmask.net/client/android/">browse all releases</a>.</p>
 <p>If you want to see the latest features and bug fixes and would like to contribute to Bitmask by testing the app, you can join <a href="https://play.google.com/apps/testing/se.leap.bitmaskclient">Google&#8217;s Beta-Channel for Bitmask</a>. The pre-releases can be found <a href="https://play.google.com/store/apps/details?id=se.leap.bitmaskclient">here</a>.</p>