# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1407090363 25200
# Node ID 93621e9633035e781bd95a4ee0458ea6db0b80f8
# Parent  37f4a3b506d98e2b838179c6b156683c377bb473
allow eula agreement to be set from deployment.connections

diff -r 37f4a3b506d9 -r 93621e963303 deployment.connections
--- a/deployment.connections	Sun Aug 03 11:16:40 2014 -0700
+++ b/deployment.connections	Sun Aug 03 11:26:03 2014 -0700
@@ -59,6 +59,7 @@
 #   keepalive                   (boolean)
 #   wifilock                    (boolean)
 #   bumpyarrows                 (boolean)
+#   eula                        (boolean)
 #   extended_longpress          (boolean)
 #   ctrl_string                 (string)
 #   picker_string               (string)
@@ -87,6 +88,7 @@
     voldn=Tab
     search=None
     ptt=Monitor Key
+    eula=true
 
 #
 # end
diff -r 37f4a3b506d9 -r 93621e963303 src/com/five_ten_sg/connectbot/HostListActivity.java
--- a/src/com/five_ten_sg/connectbot/HostListActivity.java	Sun Aug 03 11:16:40 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/HostListActivity.java	Sun Aug 03 11:26:03 2014 -0700
@@ -179,19 +179,21 @@
             }
         }
 
-        // check for eula agreement
+        makingShortcut = Intent.ACTION_CREATE_SHORTCUT.equals(getIntent().getAction())
+                         || Intent.ACTION_PICK.equals(getIntent().getAction());
+
+        // connect with hosts database, read deployment file,  and populate list
+        hostdb = new HostDatabase(this);
+        createDeploymentHosts();    // build hosts from a deployment text file
+        updateList();
+
+        // check for eula agreement, which might be set from the deployment file
         boolean agreed = prefs.getBoolean(PreferenceConstants.EULA, false);
-
         if (!agreed) {
             startActivityForResult(new Intent(this, WizardActivity.class), REQUEST_EULA);
         }
 
-        makingShortcut = Intent.ACTION_CREATE_SHORTCUT.equals(getIntent().getAction())
-                         || Intent.ACTION_PICK.equals(getIntent().getAction());
-        // connect with hosts database and populate list
-        hostdb = new HostDatabase(this);
-        createDeploymentHosts();    // build hosts from a deployment text file
-        updateList();
+        // show the list
         sortedByColor = prefs.getBoolean(PreferenceConstants.SORT_BY_COLOR, false);
         registerForContextMenu(getListView());
         getListView().setOnItemClickListener(new OnItemClickListener() {