diff options
Diffstat (limited to 'app/src/main/java')
6 files changed, 48 insertions, 130 deletions
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 0000000..650a5b5 --- /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 5c4fa79..0abcf17 100644 --- a/app/src/main/java/org/connectbot/HelpActivity.java +++ b/app/src/main/java/org/connectbot/HelpActivity.java @@ -73,5 +73,18 @@ public class HelpActivity extends Activity { // 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 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()); diff --git a/app/src/main/java/org/connectbot/SettingsActivity.java b/app/src/main/java/org/connectbot/SettingsActivity.java index 38f3367..ef90196 100644 --- a/app/src/main/java/org/connectbot/SettingsActivity.java +++ b/app/src/main/java/org/connectbot/SettingsActivity.java @@ -45,11 +45,6 @@ public class SettingsActivity extends PreferenceActivity { 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 4069c50..0000000 --- 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 d3cd832..eb0e396 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"; |