Bump version numbers for beta release.

Backport: Add download button to ExpiredActivity

See merge request akwizgran/briar!772

bramble-android/build.gradle

@@ -12,8 +12,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 1620
-		versionName "0.16.20"
+		versionCode 1621
+		versionName "0.16.21"
 		consumerProguardFiles 'proguard-rules.txt'
 	}
 

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java

@@ -778,7 +778,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 		private synchronized void enableNetwork(boolean enable) {
 			networkEnabled = enable;
-			circuitBuilt = false;
+			if (!enable) circuitBuilt = false;
 		}
 
 		private synchronized boolean isConnected() {

briar-android/build.gradle

@@ -189,8 +189,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 1620
-		versionName "0.16.20"
+		versionCode 1621
+		versionName "0.16.21"
 		applicationId "org.briarproject.briar.beta"
 		resValue "string", "app_package", "org.briarproject.briar.beta"
 		resValue "string", "app_name", "Briar Beta"

briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java

@@ -1,14 +1,20 @@
 package org.briarproject.briar.android.splash;
 
-import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.view.View.OnClickListener;
 
 import org.briarproject.briar.R;
 
+import static android.content.Intent.ACTION_VIEW;
 import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
 import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS;
 
-public class ExpiredActivity extends Activity {
+public class ExpiredActivity extends AppCompatActivity
+		implements OnClickListener {
 
 	@Override
 	public void onCreate(Bundle state) {
@@ -17,5 +23,13 @@ public class ExpiredActivity extends Activity {
 		if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
 
 		setContentView(R.layout.activity_expired);
+		findViewById(R.id.download_briar_button).setOnClickListener(this);
+	}
+
+	@Override
+	public void onClick(View v) {
+		Uri uri = Uri.parse("https://briarproject.org/download.html");
+		startActivity(new Intent(ACTION_VIEW, uri));
+		finish();
 	}
 }

briar-android/src/main/res/layout/activity_expired.xml

@@ -1,9 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
+<ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:layout_gravity="center"
-	android:gravity="center"
-	android:text="@string/expiry_date_reached"
-	android:textSize="@dimen/text_size_large"/>
+	android:orientation="vertical">
+
+	<LinearLayout
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/margin_large"
+		android:orientation="vertical">
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:gravity="center"
+			android:text="@string/expiry_date_reached"
+			android:textSize="@dimen/text_size_large"/>
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:gravity="center"
+			android:text="@string/download_briar"
+			android:textSize="@dimen/text_size_large"/>
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:gravity="center"
+			android:text="@string/create_new_account"
+			android:textSize="@dimen/text_size_large"/>
+
+		<Button
+			android:id="@+id/download_briar_button"
+			style="@style/BriarButton.Default"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:text="@string/download_briar_button"/>
+	</LinearLayout>
+</ScrollView>

briar-android/src/main/res/values/strings.xml

@@ -46,6 +46,9 @@
 	</plurals>
 	<string name="expiry_update">The beta expiry date has been extended. Your account will now expire in %d days.</string>
 	<string name="expiry_date_reached">This software has expired.\nThank you for testing!</string>
+	<string name="download_briar">To continue using Briar, please download version 1.0.</string>
+	<string name="create_new_account">You will need to create a new account, but you can use the same nickname.</string>
+	<string name="download_briar_button">Download Briar 1.0</string>
 	<string name="startup_open_database">Decrypting Database…</string>
 	<string name="startup_migrate_database">Upgrading Database…</string>