aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/org/connectbot/HostListActivity.java
diff options
context:
space:
mode:
authorJeremy Klein <jlklein@google.com>2015-08-14 11:26:11 -0700
committerJeremy Klein <jlklein@google.com>2015-08-14 11:27:55 -0700
commitaede7a2bf603500a5d52c18bbb28c89c33406537 (patch)
tree39d35476962b21245fb5c17d5c43724e877185ed /app/src/main/java/org/connectbot/HostListActivity.java
parent7de5ce146e721cbc7296c8110f6bed26d9eae8e2 (diff)
downloadconnectbot-aede7a2bf603500a5d52c18bbb28c89c33406537.tar.gz
connectbot-aede7a2bf603500a5d52c18bbb28c89c33406537.tar.bz2
connectbot-aede7a2bf603500a5d52c18bbb28c89c33406537.zip
Remove the welcome wizard activity and add the EULA to the help screen.
Diffstat (limited to 'app/src/main/java/org/connectbot/HostListActivity.java')
-rw-r--r--app/src/main/java/org/connectbot/HostListActivity.java20
1 files changed, 1 insertions, 19 deletions
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java
index a0d7901..9943d00 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 @@ public class HostListActivity extends ListActivity {
@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 class HostListActivity extends ListActivity {
}
}
- // 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());