From aede7a2bf603500a5d52c18bbb28c89c33406537 Mon Sep 17 00:00:00 2001
From: Jeremy Klein <jlklein@google.com>
Date: Fri, 14 Aug 2015 11:26:11 -0700
Subject: [PATCH 1/2] Remove the welcome wizard activity and add the EULA to
 the help screen.

---
 app/src/main/AndroidManifest.xml              |   6 +-
 .../java/org/connectbot/EulaActivity.java     |  34 ++++++
 .../java/org/connectbot/HelpActivity.java     |  13 +++
 .../java/org/connectbot/HostListActivity.java |  20 +---
 .../java/org/connectbot/SettingsActivity.java |   5 -
 .../java/org/connectbot/WizardActivity.java   | 104 ------------------
 .../connectbot/util/PreferenceConstants.java  |   2 -
 app/src/main/res/drawable/ic_btn_back.png     | Bin 861 -> 0 bytes
 app/src/main/res/drawable/ic_btn_next.png     | Bin 729 -> 0 bytes
 app/src/main/res/layout/act_eula.xml          |  92 ++++++++++++++++
 app/src/main/res/layout/act_wizard.xml        |  62 -----------
 app/src/main/res/layout/wiz_eula.xml          |  87 ---------------
 app/src/main/res/values/arrays.xml            |   6 -
 app/src/main/res/values/notrans.xml           |   2 +-
 app/src/main/res/values/strings.xml           |  10 +-
 15 files changed, 149 insertions(+), 294 deletions(-)
 create mode 100644 app/src/main/java/org/connectbot/EulaActivity.java
 delete mode 100644 app/src/main/java/org/connectbot/WizardActivity.java
 delete mode 100644 app/src/main/res/drawable/ic_btn_back.png
 delete mode 100644 app/src/main/res/drawable/ic_btn_next.png
 create mode 100644 app/src/main/res/layout/act_eula.xml
 delete mode 100644 app/src/main/res/layout/act_wizard.xml
 delete mode 100644 app/src/main/res/layout/wiz_eula.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4bbe0556..a1b65015 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -64,10 +64,14 @@
 		<activity android:name=".HostEditorActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name=".PortForwardListActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name=".SettingsActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".WizardActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name=".HelpActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name=".HelpTopicActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name=".ColorsActivity" android:configChanges="keyboardHidden|orientation" />
+		<activity android:name=".EulaActivity"	android:parentActivityName=".HelpActivity"
+			  android:configChanges="keyboardHidden|orientation" >
+			<meta-data android:name="android.support.PARENT_ACTIVITY"
+				   android:value="org.connectbot.HelpActivity" />
+		</activity>
 
 		<service android:name="org.connectbot.service.TerminalManager"
 			android:configChanges="keyboardHidden|orientation"
diff --git a/app/src/main/java/org/connectbot/EulaActivity.java b/app/src/main/java/org/connectbot/EulaActivity.java
new file mode 100644
index 00000000..650a5b58
--- /dev/null
+++ b/app/src/main/java/org/connectbot/EulaActivity.java
@@ -0,0 +1,34 @@
+/*
+ * ConnectBot: simple, powerful, open-source SSH client for Android
+ * Copyright 2015 Kenny Root, Jeffrey Sharkey
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.connectbot;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class EulaActivity extends Activity {
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.act_eula);
+
+		this.setTitle(String.format("%s: %s",
+				getResources().getText(R.string.app_name),
+				getResources().getText(R.string.terms_and_conditions)));
+	}
+}
diff --git a/app/src/main/java/org/connectbot/HelpActivity.java b/app/src/main/java/org/connectbot/HelpActivity.java
index 5c4fa793..0abcf17a 100644
--- a/app/src/main/java/org/connectbot/HelpActivity.java
+++ b/app/src/main/java/org/connectbot/HelpActivity.java
@@ -73,5 +73,18 @@ public void onClick(View v) {
 			// TODO Auto-generated catch block
 			Log.e(TAG, "couldn't get list of help assets", e);
 		}
+
+		Button button = new Button(this);
+		final String topic = getResources().getString(R.string.terms_and_conditions);
+		button.setText(topic);
+
+		button.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				Intent intent = new Intent(HelpActivity.this, EulaActivity.class);
+				HelpActivity.this.startActivity(intent);
+			}
+		});
+
+		content.addView(button);
 	}
 }
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java
index a0d79015..9943d000 100644
--- a/app/src/main/java/org/connectbot/HostListActivity.java
+++ b/app/src/main/java/org/connectbot/HostListActivity.java
@@ -70,8 +70,6 @@ public class HostListActivity extends ListActivity {
 
 	public final static int REQUEST_EDIT = 1;
 
-	public final static int REQUEST_EULA = 2;
-
 	protected TerminalManager bound = null;
 
 	protected HostDatabase hostdb;
@@ -175,17 +173,7 @@ protected void onNewIntent(Intent intent) {
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		if (requestCode == REQUEST_EULA) {
-			if (resultCode == Activity.RESULT_OK) {
-				// yay they agreed, so store that info
-				Editor edit = prefs.edit();
-				edit.putBoolean(PreferenceConstants.EULA, true);
-				edit.commit();
-			} else {
-				// user didnt agree, so close
-				this.finish();
-			}
-		} else if (requestCode == REQUEST_EDIT) {
+		if (requestCode == REQUEST_EDIT) {
 			this.updateList();
 		}
 	}
@@ -224,12 +212,6 @@ public void onCreate(Bundle icicle) {
 			}
 		}
 
-		// check for eula agreement
-		boolean agreed = prefs.getBoolean(PreferenceConstants.EULA, false);
-		if (!agreed) {
-			this.startActivityForResult(new Intent(this, WizardActivity.class), REQUEST_EULA);
-		}
-
 		this.makingShortcut = Intent.ACTION_CREATE_SHORTCUT.equals(getIntent().getAction())
 								|| Intent.ACTION_PICK.equals(getIntent().getAction());
 
diff --git a/app/src/main/java/org/connectbot/SettingsActivity.java b/app/src/main/java/org/connectbot/SettingsActivity.java
index 38f33672..ef90196d 100644
--- a/app/src/main/java/org/connectbot/SettingsActivity.java
+++ b/app/src/main/java/org/connectbot/SettingsActivity.java
@@ -45,11 +45,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
 			PreferenceManager.setDefaultValues(this, R.xml.preferences, true);
 
-			// Since they were able to get to the Settings activity, they already agreed to the EULA
-			editor = preferences.edit();
-			editor.putBoolean(PreferenceConstants.EULA, true);
-			editor.commit();
-
 			addPreferencesFromResource(R.xml.preferences);
 		}
 
diff --git a/app/src/main/java/org/connectbot/WizardActivity.java b/app/src/main/java/org/connectbot/WizardActivity.java
deleted file mode 100644
index 4069c50f..00000000
--- a/app/src/main/java/org/connectbot/WizardActivity.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * ConnectBot: simple, powerful, open-source SSH client for Android
- * Copyright 2007 Kenny Root, Jeffrey Sharkey
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.connectbot;
-
-import org.connectbot.util.HelpTopicView;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.ViewFlipper;
-
-/**
- * Show a series of wizard-like steps to the user, which might include an EULA,
- * program credits, and helpful hints.
- *
- * @author jsharkey
- */
-public class WizardActivity extends Activity {
-	protected ViewFlipper flipper = null;
-	private Button next, prev;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.act_wizard);
-
-		this.flipper = (ViewFlipper) findViewById(R.id.wizard_flipper);
-
-		// inflate the layout for EULA step
-		LayoutInflater inflater = LayoutInflater.from(this);
-		this.flipper.addView(inflater.inflate(R.layout.wiz_eula, this.flipper, false));
-
-		// Add a view for each help topic we want the user to see.
-		String[] topics = getResources().getStringArray(R.array.list_wizard_topics);
-		for (String topic : topics) {
-			flipper.addView(new HelpTopicView(this).setTopic(topic));
-		}
-
-		next = (Button) findViewById(R.id.action_next);
-		next.setOnClickListener(new OnClickListener() {
-			public void onClick(View v) {
-				if (isLastDisplayed()) {
-					// user walked past end of wizard, so return okay
-					WizardActivity.this.setResult(Activity.RESULT_OK);
-					WizardActivity.this.finish();
-				} else {
-					// show next step and update buttons
-					flipper.showNext();
-					updateButtons();
-				}
-			}
-		});
-
-		prev = (Button) findViewById(R.id.action_prev);
-		prev.setOnClickListener(new OnClickListener() {
-			public void onClick(View v) {
-				if (isFirstDisplayed()) {
-					// user walked past beginning of wizard, so return that they cancelled
-					WizardActivity.this.setResult(Activity.RESULT_CANCELED);
-					WizardActivity.this.finish();
-				} else {
-					// show previous step and update buttons
-					flipper.showPrevious();
-					updateButtons();
-				}
-			}
-		});
-
-		this.updateButtons();
-	}
-
-	protected boolean isFirstDisplayed() {
-		return (flipper.getDisplayedChild() == 0);
-	}
-
-	protected boolean isLastDisplayed() {
-		return (flipper.getDisplayedChild() == flipper.getChildCount() - 1);
-	}
-
-	protected void updateButtons() {
-		boolean eula = (flipper.getDisplayedChild() == 0);
-
-		next.setText(eula ? getString(R.string.wizard_agree) : getString(R.string.wizard_next));
-		prev.setText(eula ? getString(R.string.delete_neg) : getString(R.string.wizard_back));
-	}
-}
diff --git a/app/src/main/java/org/connectbot/util/PreferenceConstants.java b/app/src/main/java/org/connectbot/util/PreferenceConstants.java
index d3cd8322..eb0e3966 100644
--- a/app/src/main/java/org/connectbot/util/PreferenceConstants.java
+++ b/app/src/main/java/org/connectbot/util/PreferenceConstants.java
@@ -66,8 +66,6 @@ public class PreferenceConstants {
 
 	public static final String BUMPY_ARROWS = "bumpyarrows";
 
-	public static final String EULA = "eula";
-
 	public static final String SORT_BY_COLOR = "sortByColor";
 
 	public static final String BELL = "bell";
diff --git a/app/src/main/res/drawable/ic_btn_back.png b/app/src/main/res/drawable/ic_btn_back.png
deleted file mode 100644
index 9615e67b8abde7043ace958b88b93a84bd20b736..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 861
zcmV-j1ETziP)<h;3K|Lk000e1NJLTq000#L000#T1^@s6sTZY|0009dNkl<ZILoD!
zONbm*6o$Y1sIJ@3R8MA1_sk>)O+=#x7cy!Bx)(PZ5nTx~u7<c!6ct3=1<{a&Zh{ZQ
zz34&^M6ypn7m99NL?!7!6lSKUyQ{13!$nP3ciW>G@WA0#UC#OMx%dCi5l_9rW1XLP
zH?^$sKh0<^x9{UMv2l@3$;ejw7{rymg9QR1Gy+M$6M`iWW@3hY===&<>Tl@wQCj5$
zl!oB<02B%(E5x#a5E|?I4E+`%WHWIk1FLt#V3U?agAm}|KimuOnurEfwL&AhlZRVx
zqbL)+n2&ck4jLpDyr1>pLHLN0Xi`<H9Egtd=<0hMPtK5LU926=<%}H*8VlY|Ul*i^
ziFK2zZnJ3a<@AwvI1nEtb6xO?vOGk<GjctwAK-&4@&^|50MKqih>|fTTBN3zS*|_8
z=_7ApbhAiWh)-bj0-5WwHN47>>kwRjLffR$fDj5T%NVstO|NjQ`8aEbUq;DzLWZjI
z+{sJD|3_C&;;he~EKJm(u@Ia@DT7f<)buj<A9|h#R@QH+%gx>&WTOFysm-ENCx8gy
zOFX!GmJ_XK_9gao2dn_4W<h0Y!Hyig{w8-Fe0tx2kQ3}JxG7KVuB2=R{cZT-yK{Vd
z<%9i$x(V>u8G{CwKZ_8K&%S<%kH0*N_wJUU!+u`SJm~I;QbD;6jRm;$!-t&z{Mnp@
z|FGUBjE3{q7aJD|)k;oZ2;fFA=)(4&f#qb4H(&gUq~0ok&b%VX24Jd?+y?apK@?Lc
zz-@=!Hnjn71HlD^2$*W1eh{v2UFOyIAL6&`KNg_L6147srNdBZfRF+2LV-~bH9Zu9
z&kv2uP;WvSe&_WIr}+NoZ}P5_P^m+?208-5Y<?mB>E55r(0rWLn$QzFocrVnUU>2X
zE(1RTFaG7BEr^Ztgi^JH^Vyy;!RKUTgM11_B`B3aMf0&rme}rP=p;$5#nIBrU)`&C
zKiU&mM|szTkWVooav4sWlo8F!?a1inHQio3wcc*t^QnPWs=-)8s?&TW1#Q5l7;Q*x
niXq=0uZ+JmV7bw``OEs>=pTuA@?Qb700000NkvXXu0mjf#Vek3

diff --git a/app/src/main/res/drawable/ic_btn_next.png b/app/src/main/res/drawable/ic_btn_next.png
deleted file mode 100644
index ea2a80e7eed90188d988b56f4def743eadba22e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 729
zcmV;~0w(>5P)<h;3K|Lk000e1NJLTq000#L000#T1^@s6sTZY|0007@Nkl<ZILoD#
zKWJ1z5XOHwHZTufu@54=2L^IrbC4z}gxClvO?U0J>0%cN2v!msO{H8T2CG;o#7--(
zu?UEeCXm7+7KS^Ba1T6q1KGl2_x%$j5f_fR-JAJ#_M4gS=K2r0J3is5I&SlyOAKGK
zWp?JaUNV-LH0y%IEf*wMMZ=laKRdwGTb;r98>lid*%GNFAV$C`iXdgM$%u>)0fn2Q
zF0a59L7M&|WIaWvq#X<hpiWT-I0YvGR9L@xKpL+TnJ!{1>OdVHu=4j-@Y#285VjC(
zb%9Pv;}zD^y$aZx48exC2+ep6`%ZZa>Uk1p5tAZVa8V=UU3zvvWKzUrh_gP9X1r23
zFa;n^d=VTV37K>O+bED<E9n;2WE@R~V5pxTJjMCM3=X&qhx7ihzx?U1ZPQ)o6Pb+B
zk6oBS&KSKcd&DQ_ISn^xq2#~LuI$Iuu5oW^k0|c7ISxe&oO<U%p_pB-(QVwLe``o&
zx`8^O#Ojn;7Ov6M*PS3qSzFp>n&%Yiv(z%v0*FHO{{?jN^OWKH0h%`wtDdjnK!sed
z2YCAZi0$XA<g<w%S66>bbB@)izx9eW`uc|b!vRqOHl_v*ZDzFj<dEfHXO4UZ*@ETO
z<7o@<@Z%E>K0hK!z*;|4e#`^UWuFS5>Tj|!$fD<1gqA7|-)%BF-Y2;c0E0@Ev1Or5
z)u+v>#vy~Uy`1vk#RlVxkq2x(xhaKVU-fA<0HuRMuFCPr2kt*x<!n5vI8@X2ZBbYi
z3aQ1RCB@3#+YOk9>;@21&A0|lYgyxmwPUS4PvUM+_#l3+rXfini7QpCGyD?}A(0Gg
z?YYSo?rdgB@Ab+esT!|XYSdd4!asr-L0zfywWa*#DVdBfPB(u8VAxC{_Fo-a00000
LNkvXXu0mjf20csG

diff --git a/app/src/main/res/layout/act_eula.xml b/app/src/main/res/layout/act_eula.xml
new file mode 100644
index 00000000..de4ddc4d
--- /dev/null
+++ b/app/src/main/res/layout/act_eula.xml
@@ -0,0 +1,92 @@
+<!--
+  ~ ConnectBot: simple, powerful, open-source SSH client for Android
+  ~ Copyright 2015 Kenny Root, Jeffrey Sharkey
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:tools="http://schemas.android.com/tools"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		tools:context="org.connectbot.EulaActivity">
+
+	<ScrollView
+			xmlns:android="http://schemas.android.com/apk/res/android"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			>
+
+		<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:padding="10dip"
+				>
+
+			<TextView
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:text="ConnectBot is a simple, powerful, open-source Secure Shell (SSH) client for your Android device."
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					/>
+
+			<TextView
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:paddingTop="10dip"
+					android:text="It can manage several SSH sessions, create secure tunnels, and copy/paste between other apps."
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					/>
+
+			<TextView
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:paddingTop="10dip"
+					android:autoLink="web"
+					android:text="@string/copyright_info"
+					android:textAppearance="?android:attr/textAppearanceSmall"
+					/>
+
+			<TextView
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:paddingTop="10dip"
+					android:text="About and Credits"
+					android:textAppearance="?android:attr/textAppearanceMedium"
+					/>
+
+			<TextView
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:paddingTop="10dip"
+					android:autoLink="web"
+					android:text="Copyright \u00a9 2007-2008 Kenny Root http://the-b.org, Jeffrey Sharkey http://jsharkey.org\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license.  Copyright \u00a9 2007 Trilead AG.  http://www.trilead.com\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license.  Copyright \u00a9 Matthias L. Jugel, Marcus Meiner 1996-2005.  http://www.javassh.org\n\nAlso based in part on the JSOCKS library, provided under the GNU LGPL license. http://jsocks.sourceforge.net\n\nAlso based in part on JZlib provided under a BSD-style license. Copyright \u00a9 JCraft, Inc., 2000-2004 http://www.jcraft.com"
+					android:textSize="14sp"
+					android:textColor="#bebebe"
+					/>
+
+			<TextView
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:paddingTop="10dip"
+					android:text="@string/msg_version"
+					android:textAppearance="?android:attr/textAppearanceSmall"
+					/>
+
+		</LinearLayout>
+
+	</ScrollView>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/act_wizard.xml b/app/src/main/res/layout/act_wizard.xml
deleted file mode 100644
index 97205b90..00000000
--- a/app/src/main/res/layout/act_wizard.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * ConnectBot: simple, powerful, open-source SSH client for Android
- * Copyright 2007 Kenny Root, Jeffrey Sharkey
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:gravity="end"
-	>
-
-	<ViewFlipper
-		android:id="@+id/wizard_flipper"
-		android:layout_width="fill_parent"
-		android:layout_height="0dip"
-		android:layout_weight="1"
-		/>
-
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:padding="5dip"
-		>
-
-		<Button
-			android:id="@+id/action_prev"
-			android:layout_width="120dip"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_btn_back"
-			android:text="Cancel"
-			android:gravity="center"
-			/>
-
-		<Button
-			android:id="@+id/action_next"
-			android:layout_width="120dip"
-			android:layout_height="wrap_content"
-			android:drawableRight="@drawable/ic_btn_next"
-			android:text="Agree"
-			android:gravity="center"
-			/>
-
-	</LinearLayout>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/wiz_eula.xml b/app/src/main/res/layout/wiz_eula.xml
deleted file mode 100644
index 228befe9..00000000
--- a/app/src/main/res/layout/wiz_eula.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * ConnectBot: simple, powerful, open-source SSH client for Android
- * Copyright 2007 Kenny Root, Jeffrey Sharkey
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	>
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:padding="10dip"
-		>
-
-		<TextView
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:text="ConnectBot is a simple, powerful, open-source Secure Shell (SSH) client for your Android device."
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			/>
-
-		<TextView
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:paddingTop="10dip"
-			android:text="It can manage several SSH sessions, create secure tunnels, and copy/paste between other apps."
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			/>
-
-		<TextView
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:paddingTop="10dip"
-			android:autoLink="web"
-			android:text="@string/copyright_info"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			/>
-
- 		<TextView
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:paddingTop="10dip"
-			android:text="About and Credits"
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			/>
-
-		<TextView
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:paddingTop="10dip"
-			android:autoLink="web"
-			android:text="Copyright \u00a9 2007-2008 Kenny Root http://the-b.org, Jeffrey Sharkey http://jsharkey.org\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license.  Copyright \u00a9 2007 Trilead AG.  http://www.trilead.com\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license.  Copyright \u00a9 Matthias L. Jugel, Marcus Meiner 1996-2005.  http://www.javassh.org\n\nAlso based in part on the JSOCKS library, provided under the GNU LGPL license. http://jsocks.sourceforge.net\n\nAlso based in part on JZlib provided under a BSD-style license. Copyright \u00a9 JCraft, Inc., 2000-2004 http://www.jcraft.com"
-			android:textSize="14sp"
-			android:textColor="#bebebe"
-			/>
-
-		<TextView
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:paddingTop="10dip"
-			android:text="@string/msg_version"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			/>
-
-	</LinearLayout>
-
-</ScrollView>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 4721490f..23bb1d9c 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -123,12 +123,6 @@
 		<item>@string/portforward_dynamic</item>
 	</string-array>
 
-	<string-array name="list_wizard_topics" translatable="false">
-		<item>Hints</item>
-		<item>PhysicalKeyboard</item>
-		<item>VirtualKeyboard</item>
-	</string-array>
-
 	<string-array name="list_delkey" translatable="false">
 		<item>@string/list_delkey_del</item>
 		<item>@string/list_delkey_backspace</item>
diff --git a/app/src/main/res/values/notrans.xml b/app/src/main/res/values/notrans.xml
index 5dacca60..4311e3b8 100644
--- a/app/src/main/res/values/notrans.xml
+++ b/app/src/main/res/values/notrans.xml
@@ -20,7 +20,7 @@
 <resources>
 	<string name="app_name" translatable="false">ConnectBot</string>
 
-	<string name="copyright_info" translatable="false">Before we get started, we need to get some legal information out of the way.  ConnectBot is provided under the Apache License, Version 2.0 (the &#x201C;License&#x201D;).  Here are a few key points:\n\nYou may not use this program except in compliance with the License. You may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &#x201C;AS IS&#x201D; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</string>
+	<string name="copyright_info" translatable="false">ConnectBot is provided under the Apache License, Version 2.0 (the &#x201C;License&#x201D;).  Here are a few key points:\n\nYou may not use this program except in compliance with the License. You may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &#x201C;AS IS&#x201D; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</string>
 
 	<!-- "Up" button in virtual keyboard. -->
 	<string name="button_key_up">\u25B2</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e08dbd47..c2ce2e7b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,6 +53,9 @@
 	<string name="help_about">"About ConnectBot"</string>
 	<string name="help_keyboard">"Keyboard"</string>
 
+	<!-- Title for the help page with the terms & conditions of the app. -->
+	<string name="terms_and_conditions">"Terms &amp; Conditions"</string>
+
 	<string name="pubkey_generate">"Generate"</string>
 	<string name="pubkey_import">"Import"</string>
 	<string name="pubkey_delete">"Delete key"</string>
@@ -429,13 +432,6 @@
 	<string name="disconnect_all_pos">"Yes, disconnect"</string>
 	<string name="disconnect_all_neg">"Cancel"</string>
 
-	<!-- Button to agree to license terms. -->
-	<string name="wizard_agree">"Agree"</string>
-	<!-- Button to go to the next page in the first time start-up wizard. -->
-	<string name="wizard_next">"Next"</string>
-	<!-- Button to go to the previous page in the first time start-up wizard. -->
-	<string name="wizard_back">"Back"</string>
-
 	<string name="terminal_no_hosts_connected">"No hosts currently connected"</string>
 
 	<!-- Displayed in terminal when attempting to connect to a host. The first two

From b0a0047c405e2b549e9a5ed8e7529ae61542ac72 Mon Sep 17 00:00:00 2001
From: Jeremy Klein <jlklein@google.com>
Date: Fri, 14 Aug 2015 11:55:39 -0700
Subject: [PATCH 2/2] Remove unused imports

---
 app/src/main/java/org/connectbot/HostListActivity.java | 1 -
 app/src/main/java/org/connectbot/SettingsActivity.java | 2 --
 2 files changed, 3 deletions(-)

diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java
index 9943d000..2d8e8825 100644
--- a/app/src/main/java/org/connectbot/HostListActivity.java
+++ b/app/src/main/java/org/connectbot/HostListActivity.java
@@ -26,7 +26,6 @@
 import org.connectbot.util.HostDatabase;
 import org.connectbot.util.PreferenceConstants;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ListActivity;
 import android.content.ComponentName;
diff --git a/app/src/main/java/org/connectbot/SettingsActivity.java b/app/src/main/java/org/connectbot/SettingsActivity.java
index ef90196d..153f4ba6 100644
--- a/app/src/main/java/org/connectbot/SettingsActivity.java
+++ b/app/src/main/java/org/connectbot/SettingsActivity.java
@@ -17,8 +17,6 @@
 
 package org.connectbot;
 
-import org.connectbot.util.PreferenceConstants;
-
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;