Get rid of the final html help view and switch it to native.

1 files changed, 8 insertions, 40 deletions

diff --git a/app/src/main/java/org/connectbot/HelpActivity.java b/app/src/main/java/org/connectbot/HelpActivity.java
index 3df8b2f..998dfe0 100644
--- a/app/src/main/java/org/connectbot/HelpActivity.java
+++ b/app/src/main/java/org/connectbot/HelpActivity.java
@@ -17,30 +17,20 @@
 
 package org.connectbot;
 
-import java.io.IOException;
-
 import android.app.AlertDialog;
 import android.content.Intent;
-import android.content.res.AssetManager;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-import android.widget.LinearLayout;
 
 /**
  * @author Kenny Root
  *
  */
 public class HelpActivity extends AppCompatActivity {
-	public final static String TAG = "CB.HelpActivity";
-
-	public final static String HELPDIR = "help";
-	public final static String SUFFIX = ".html";
-
 	private LayoutInflater inflater = null;
 
 
@@ -49,35 +39,16 @@ public class HelpActivity extends AppCompatActivity {
 		super.onCreate(icicle);
 		setContentView(R.layout.act_help);
 
-		AssetManager am = this.getAssets();
-		LinearLayout content = (LinearLayout) findViewById(R.id.topics);
-
-		try {
-			for (String name : am.list(HELPDIR)) {
-				if (name.endsWith(SUFFIX)) {
-					Button button = new Button(this);
-					final String topic = name.substring(0, name.length() - SUFFIX.length());
-					button.setText(topic);
-
-					button.setOnClickListener(new OnClickListener() {
-						public void onClick(View v) {
-							Intent intent = new Intent(HelpActivity.this, HelpTopicActivity.class);
-							intent.putExtra(Intent.EXTRA_TITLE, topic);
-							HelpActivity.this.startActivity(intent);
-						}
-					});
-
-					content.addView(button);
-				}
+		Button hintsButton = (Button) findViewById(R.id.hints_button);
+		hintsButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				Intent intent = new Intent(HelpActivity.this, HintsActivity.class);
+				HelpActivity.this.startActivity(intent);
 			}
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			Log.e(TAG, "couldn't get list of help assets", e);
-		}
+		});
 
 		inflater = LayoutInflater.from(this);
-		Button shortcutsButton = new Button(this);
-		shortcutsButton.setText(getResources().getString(R.string.keyboard_shortcuts));
+		Button shortcutsButton = (Button) findViewById(R.id.shortcuts_button);
 		shortcutsButton.setOnClickListener(new OnClickListener() {
 			public void onClick(View v) {
 				final View shortcuts = inflater.inflate(R.layout.dia_keyboard_shortcuts, null, false);
@@ -87,16 +58,13 @@ public class HelpActivity extends AppCompatActivity {
 						.show();
 			}
 		});
-		content.addView(shortcutsButton);
 
-		Button eulaButton = new Button(this);
-		eulaButton.setText(getResources().getString(R.string.terms_and_conditions));
+		Button eulaButton = (Button) findViewById(R.id.eula_button);
 		eulaButton.setOnClickListener(new OnClickListener() {
 			public void onClick(View v) {
 				Intent intent = new Intent(HelpActivity.this, EulaActivity.class);
 				HelpActivity.this.startActivity(intent);
 			}
 		});
-		content.addView(eulaButton);
 	}
 }