update documentation for android

4 files changed, 119 insertions, 0 deletions

diff --git a/pages/android/en.text b/pages/android/en.text
index 6418162..ed83fb3 100644
--- a/pages/android/en.text
+++ b/pages/android/en.text
@@ -23,10 +23,30 @@ h2. Download app
 
 Alternately, you can download the Bitmask app directly from this website. You will need to enabled the option <b>Settings > Security > Unknown Sources</b> on your device for this method to work.
 
+h3. Stable version
+
 p(android). <%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk', :text => 'Download for Android'}) %>
 
 p(non-android). !/assets/qr/dl.bitmask.net-bitmask-android-latest.png!:https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk
 
+h3. Beta version
+
+<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/android/beta/Bitmask-Android-0.9.7-rc1.apk', :text => 'Download for Android'}) %>
+
+<%= render({:partial => 'common/notice'}, {:type => 'warning', :text => '<b>ATTENTION:</b> Please verify that the signing certificate of the downloaded app matches this SHA256 fingerprint:<p> 9C:94:DB:F8:46:FD:95:97:47:57:17:2A:6A:8D:9A:9B:DF:8C:40:21:A6:6C:15:11:28:28:D1:72:39:1B:81:AA </p>'}) %>
+
+h3. How to verify the fingerprint - using the command line on Linux
+
+bc. cd /path/to/your/apk
+unzip -p bitmask.apk META-INF/*.RSA | keytool -printcert
+
+
 h2. Download other versions
 
 If you want to install an old version of Bitmask, you can [[browse all releases => https://dl.bitmask.net/client/android/]].
+
+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 Google's Beta-Channel for Bitmask. These pre-releases can be found [[here =>  https://play.google.com/store/apps/details?id=se.leap.bitmaskclient]]. 
+
+If you find any bugs you can file a ticket on our [[GitLab platform => https://0xacab.org/leap/bitmask_android/issues]]. You can either create an account on 0xacab.org or simply login with your github.com or gitlab.com account to create new tickets.
+
+Finally you can also download the [[latest build artifact => https://0xacab.org/leap/bitmask_android/builds/artifacts/master/download?job=build]] from our CI. This version is not signed and therefore you can not verify the integrity and security of that app! This is only an option for curious testers and it's not ment for regular use. 
diff --git a/public/android/index.en.html b/public/android/index.en.html
index e802479..27ad295 100644
--- a/public/android/index.en.html
+++ b/public/android/index.en.html
@@ -23,6 +23,17 @@ Bitmask Downloads
   </li>
   <li>
     <a href="#download-app">Download app</a>
+    <ol>
+      <li>
+        <a href="#stable-version">Stable version</a>
+      </li>
+      <li>
+        <a href="#beta-version">Beta version</a>
+      </li>
+      <li>
+        <a href="#how-to-verify-the-fingerprint-using-the-command-line-on-linux">How to verify the fingerprint – using the command line on Linux</a>
+      </li>
+    </ol>
   </li>
   <li>
     <a href="#download-other-versions">Download other versions</a>
@@ -53,14 +64,36 @@ Bitmask Downloads
 <p class="non-android"><a href="https://play.google.com/store/apps/details?id=se.leap.bitmaskclient"><img src="/assets/qr/market-se.leap.bitmaskclient.png" alt="" /></a></p>
 <h2><a name="download-app"></a>Download app</h2>
 <p>Alternately, you can download the Bitmask app directly from this website. You will need to enabled the option <b>Settings &gt; Security &gt; Unknown Sources</b> on your device for this method to work.</p>
+<h3><a name="stable-version"></a>Stable version</h3>
 <p class="android"><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk'>
   <i class='fa fa-cloud-download fa-lg'></i>
   Download for Android
 </a>
 </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'>
+  <i class='fa fa-cloud-download fa-lg'></i>
+  Download for Android
+</a>
+</p>
+<p><div class='row'>
+  <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 verify that the signing certificate of the downloaded app matches this SHA256 fingerprint:<p> 9C:94:DB:F8:46:FD:95:97:47:57:17:2A:6A:8D:9A:9B:DF:8C:40:21:A6:6C:15:11:28:28:D1:72:39:1B:81:AA </p>
+    </div>
+  </div>
+</div>
+</p>
+<h3><a name="how-to-verify-the-fingerprint-using-the-command-line-on-linux"></a>How to verify the fingerprint – using the command line on Linux</h3>
+<pre><code>cd /path/to/your/apk
+unzip -p bitmask.apk META-INF/*.RSA | keytool -printcert</code></pre>
 <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 Google&#8217;s Beta-Channel for Bitmask. These pre-releases can be found <a href="https://play.google.com/store/apps/details?id=se.leap.bitmaskclient">here</a>.</p>
+<p>If you find any bugs you can file a ticket on our <a href="https://0xacab.org/leap/bitmask_android/issues">GitLab platform</a>. You can either create an account on 0xacab.org or simply login with your github.com or gitlab.com account to create new tickets.</p>
+<p>Finally you can also download the <a href="https://0xacab.org/leap/bitmask_android/builds/artifacts/master/download?job=build">latest build artifact</a> from our CI. This version is not signed and therefore you can not verify the integrity and security of that app! This is only an option for curious testers and it&#8217;s not ment for regular use.</p>
 </div>
 <footer>
 <div>
diff --git a/public/android/index.es.html b/public/android/index.es.html
index 5cb8ce9..335b513 100644
--- a/public/android/index.es.html
+++ b/public/android/index.es.html
@@ -23,6 +23,17 @@ Bitmask Downloads
   </li>
   <li>
     <a href="#download-app">Download app</a>
+    <ol>
+      <li>
+        <a href="#stable-version">Stable version</a>
+      </li>
+      <li>
+        <a href="#beta-version">Beta version</a>
+      </li>
+      <li>
+        <a href="#how-to-verify-the-fingerprint-using-the-command-line-on-linux">How to verify the fingerprint – using the command line on Linux</a>
+      </li>
+    </ol>
   </li>
   <li>
     <a href="#download-other-versions">Download other versions</a>
@@ -53,14 +64,36 @@ Bitmask Downloads
 <p class="non-android"><a href="https://play.google.com/store/apps/details?id=se.leap.bitmaskclient"><img src="/assets/qr/market-se.leap.bitmaskclient.png" alt="" /></a></p>
 <h2><a name="download-app"></a>Download app</h2>
 <p>Alternately, you can download the Bitmask app directly from this website. You will need to enabled the option <b>Settings &gt; Security &gt; Unknown Sources</b> on your device for this method to work.</p>
+<h3><a name="stable-version"></a>Stable version</h3>
 <p class="android"><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk'>
   <i class='fa fa-cloud-download fa-lg'></i>
   Download for Android
 </a>
 </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'>
+  <i class='fa fa-cloud-download fa-lg'></i>
+  Download for Android
+</a>
+</p>
+<p><div class='row'>
+  <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 verify that the signing certificate of the downloaded app matches this SHA256 fingerprint:<p> 9C:94:DB:F8:46:FD:95:97:47:57:17:2A:6A:8D:9A:9B:DF:8C:40:21:A6:6C:15:11:28:28:D1:72:39:1B:81:AA </p>
+    </div>
+  </div>
+</div>
+</p>
+<h3><a name="how-to-verify-the-fingerprint-using-the-command-line-on-linux"></a>How to verify the fingerprint – using the command line on Linux</h3>
+<pre><code>cd /path/to/your/apk
+unzip -p bitmask.apk META-INF/*.RSA | keytool -printcert</code></pre>
 <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 Google&#8217;s Beta-Channel for Bitmask. These pre-releases can be found <a href="https://play.google.com/store/apps/details?id=se.leap.bitmaskclient">here</a>.</p>
+<p>If you find any bugs you can file a ticket on our <a href="https://0xacab.org/leap/bitmask_android/issues">GitLab platform</a>. You can either create an account on 0xacab.org or simply login with your github.com or gitlab.com account to create new tickets.</p>
+<p>Finally you can also download the <a href="https://0xacab.org/leap/bitmask_android/builds/artifacts/master/download?job=build">latest build artifact</a> from our CI. This version is not signed and therefore you can not verify the integrity and security of that app! This is only an option for curious testers and it&#8217;s not ment for regular use.</p>
 </div>
 <footer>
 <div>
diff --git a/public/android/index.pt.html b/public/android/index.pt.html
index b9e91b8..e907986 100644
--- a/public/android/index.pt.html
+++ b/public/android/index.pt.html
@@ -23,6 +23,17 @@ Bitmask Downloads
   </li>
   <li>
     <a href="#download-app">Download app</a>
+    <ol>
+      <li>
+        <a href="#stable-version">Stable version</a>
+      </li>
+      <li>
+        <a href="#beta-version">Beta version</a>
+      </li>
+      <li>
+        <a href="#how-to-verify-the-fingerprint-using-the-command-line-on-linux">How to verify the fingerprint – using the command line on Linux</a>
+      </li>
+    </ol>
   </li>
   <li>
     <a href="#download-other-versions">Download other versions</a>
@@ -53,14 +64,36 @@ Bitmask Downloads
 <p class="non-android"><a href="https://play.google.com/store/apps/details?id=se.leap.bitmaskclient"><img src="/assets/qr/market-se.leap.bitmaskclient.png" alt="" /></a></p>
 <h2><a name="download-app"></a>Download app</h2>
 <p>Alternately, you can download the Bitmask app directly from this website. You will need to enabled the option <b>Settings &gt; Security &gt; Unknown Sources</b> on your device for this method to work.</p>
+<h3><a name="stable-version"></a>Stable version</h3>
 <p class="android"><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk'>
   <i class='fa fa-cloud-download fa-lg'></i>
   Download for Android
 </a>
 </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'>
+  <i class='fa fa-cloud-download fa-lg'></i>
+  Download for Android
+</a>
+</p>
+<p><div class='row'>
+  <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 verify that the signing certificate of the downloaded app matches this SHA256 fingerprint:<p> 9C:94:DB:F8:46:FD:95:97:47:57:17:2A:6A:8D:9A:9B:DF:8C:40:21:A6:6C:15:11:28:28:D1:72:39:1B:81:AA </p>
+    </div>
+  </div>
+</div>
+</p>
+<h3><a name="how-to-verify-the-fingerprint-using-the-command-line-on-linux"></a>How to verify the fingerprint – using the command line on Linux</h3>
+<pre><code>cd /path/to/your/apk
+unzip -p bitmask.apk META-INF/*.RSA | keytool -printcert</code></pre>
 <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 Google&#8217;s Beta-Channel for Bitmask. These pre-releases can be found <a href="https://play.google.com/store/apps/details?id=se.leap.bitmaskclient">here</a>.</p>
+<p>If you find any bugs you can file a ticket on our <a href="https://0xacab.org/leap/bitmask_android/issues">GitLab platform</a>. You can either create an account on 0xacab.org or simply login with your github.com or gitlab.com account to create new tickets.</p>
+<p>Finally you can also download the <a href="https://0xacab.org/leap/bitmask_android/builds/artifacts/master/download?job=build">latest build artifact</a> from our CI. This version is not signed and therefore you can not verify the integrity and security of that app! This is only an option for curious testers and it&#8217;s not ment for regular use.</p>
 </div>
 <footer>
 <div>