aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/org/connectbot/ConsoleActivity.java4
-rw-r--r--src/org/connectbot/HostEditorActivity.java5
-rw-r--r--src/org/connectbot/HostListActivity.java7
-rw-r--r--src/org/connectbot/TerminalView.java6
-rw-r--r--src/org/connectbot/WizardActivity.java7
-rw-r--r--src/org/connectbot/service/TerminalBridge.java7
-rw-r--r--src/org/connectbot/service/TerminalManager.java2
-rw-r--r--src/org/connectbot/util/HostBinder.java3
-rw-r--r--src/org/connectbot/util/HostDatabase.java4
-rw-r--r--src/org/connectbot/util/KeyDatabase.java3
10 files changed, 10 insertions, 38 deletions
diff --git a/src/org/connectbot/ConsoleActivity.java b/src/org/connectbot/ConsoleActivity.java
index 6c6c004..d85e085 100644
--- a/src/org/connectbot/ConsoleActivity.java
+++ b/src/org/connectbot/ConsoleActivity.java
@@ -21,8 +21,6 @@ package org.connectbot;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalManager;
-import de.mud.terminal.vt320;
-
import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
@@ -53,6 +51,7 @@ import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.ViewFlipper;
+import de.mud.terminal.vt320;
public class ConsoleActivity extends Activity {
@@ -327,7 +326,6 @@ public class ConsoleActivity extends Activity {
float distx = e2.getRawX() - e1.getRawX();
float disty = e2.getRawY() - e1.getRawY();
int goalwidth = flip.getWidth() / 2;
- int goalheight = flip.getHeight() / 2;
// need to slide across half of display to trigger console change
// make sure user kept a steady hand horizontally
diff --git a/src/org/connectbot/HostEditorActivity.java b/src/org/connectbot/HostEditorActivity.java
index 522f33a..6d6e80a 100644
--- a/src/org/connectbot/HostEditorActivity.java
+++ b/src/org/connectbot/HostEditorActivity.java
@@ -25,9 +25,6 @@ import java.util.Map;
import org.connectbot.util.HostDatabase;
-
-
-import android.app.Activity;
import android.content.ContentValues;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -201,7 +198,7 @@ public class HostEditorActivity extends PreferenceActivity implements OnSharedPr
// TODO: we could pass through a specific ContentProvider uri here
//this.getPreferenceManager().setSharedPreferencesName(uri);
- this.pref = new CursorPreferenceHack(db.getWritableDatabase(), db.TABLE_HOSTS, id);
+ this.pref = new CursorPreferenceHack(db.getWritableDatabase(), HostDatabase.TABLE_HOSTS, id);
this.pref.registerOnSharedPreferenceChangeListener(this);
this.addPreferencesFromResource(R.xml.host_prefs);
diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java
index df12df0..6958569 100644
--- a/src/org/connectbot/HostListActivity.java
+++ b/src/org/connectbot/HostListActivity.java
@@ -25,7 +25,6 @@ import org.connectbot.util.HostBinder;
import org.connectbot.util.HostDatabase;
import org.connectbot.util.UpdateHelper;
-
import android.app.Activity;
import android.app.ListActivity;
import android.content.ComponentName;
@@ -41,19 +40,15 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
-import android.util.Log;
import android.view.ContextMenu;
import android.view.KeyEvent;
-import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.View.OnClickListener;
import android.view.View.OnKeyListener;
import android.widget.AdapterView;
import android.widget.ListView;
-import android.widget.SimpleAdapter;
import android.widget.SimpleCursorAdapter;
import android.widget.TextView;
import android.widget.AdapterView.OnItemClickListener;
@@ -247,7 +242,7 @@ public class HostListActivity extends ListActivity {
if(port == -1) port = 22;
String nickname = String.format("%s@%s", username, hostname);
- hostdb.createHost(null, nickname, username, hostname, port, hostdb.COLOR_GRAY);
+ hostdb.createHost(null, nickname, username, hostname, port, HostDatabase.COLOR_GRAY);
Intent intent = new Intent(HostListActivity.this, ConsoleActivity.class);
intent.setData(Uri.parse(String.format("ssh://%s@%s:%s/#%s", username, hostname, port, nickname)));
diff --git a/src/org/connectbot/TerminalView.java b/src/org/connectbot/TerminalView.java
index d94b84b..c25507c 100644
--- a/src/org/connectbot/TerminalView.java
+++ b/src/org/connectbot/TerminalView.java
@@ -20,11 +20,11 @@ package org.connectbot;
import org.connectbot.service.TerminalBridge;
+import android.app.Activity;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.PixelXorXfermode;
-import android.os.Handler;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
@@ -54,8 +54,8 @@ public class TerminalView extends View {
this.setFocusableInTouchMode(true);
this.cursorPaint = new Paint();
- this.cursorPaint.setColor(bridge.color[bridge.COLOR_FG_STD]);
- this.cursorPaint.setXfermode(new PixelXorXfermode(bridge.color[bridge.COLOR_BG_STD]));
+ this.cursorPaint.setColor(bridge.color[TerminalBridge.COLOR_FG_STD]);
+ this.cursorPaint.setXfermode(new PixelXorXfermode(bridge.color[TerminalBridge.COLOR_BG_STD]));
// connect our view up to the bridge
this.setOnKeyListener(bridge);
diff --git a/src/org/connectbot/WizardActivity.java b/src/org/connectbot/WizardActivity.java
index 48cba6b..e1570a5 100644
--- a/src/org/connectbot/WizardActivity.java
+++ b/src/org/connectbot/WizardActivity.java
@@ -20,18 +20,11 @@ package org.connectbot;
import android.app.Activity;
import android.content.Context;
-import android.content.Intent;
import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.ScrollView;
import android.widget.ViewFlipper;
/**
diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java
index 69f712e..2b846aa 100644
--- a/src/org/connectbot/service/TerminalBridge.java
+++ b/src/org/connectbot/service/TerminalBridge.java
@@ -22,11 +22,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import org.connectbot.TerminalView;
+
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
-import android.graphics.PixelXorXfermode;
import android.graphics.Typeface;
import android.graphics.Bitmap.Config;
import android.graphics.Paint.FontMetricsInt;
@@ -38,10 +39,10 @@ import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnKeyListener;
+import com.trilead.ssh2.Connection;
import com.trilead.ssh2.KnownHosts;
import com.trilead.ssh2.ServerHostKeyVerifier;
import com.trilead.ssh2.Session;
-import com.trilead.ssh2.Connection;
import de.mud.terminal.VDUBuffer;
import de.mud.terminal.VDUDisplay;
@@ -125,7 +126,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener {
case KnownHosts.HOSTKEY_IS_NEW:
// prompt user
outputLine(String.format("The authenticity of host '%s' can't be established.", hostname));
- outputLine(String.format("RSA key fingerprint is %s", hosts.createHexFingerprint(serverHostKeyAlgorithm, serverHostKey)));
+ outputLine(String.format("RSA key fingerprint is %s", KnownHosts.createHexFingerprint(serverHostKeyAlgorithm, serverHostKey)));
outputLine("[For now we'll assume you accept this key, but tap Menu and Disconnect if not.]");
//outputLine("Are you sure you want to continue connecting (yes/no)? ");
return true;
diff --git a/src/org/connectbot/service/TerminalManager.java b/src/org/connectbot/service/TerminalManager.java
index 9a5828b..2c5e6c2 100644
--- a/src/org/connectbot/service/TerminalManager.java
+++ b/src/org/connectbot/service/TerminalManager.java
@@ -24,8 +24,6 @@ import java.util.List;
import org.connectbot.R;
import org.connectbot.util.HostDatabase;
-import com.trilead.ssh2.Connection;
-
import android.app.Service;
import android.content.Intent;
import android.content.SharedPreferences;
diff --git a/src/org/connectbot/util/HostBinder.java b/src/org/connectbot/util/HostBinder.java
index 7c78c26..927a740 100644
--- a/src/org/connectbot/util/HostBinder.java
+++ b/src/org/connectbot/util/HostBinder.java
@@ -19,14 +19,11 @@
package org.connectbot.util;
import org.connectbot.R;
-import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalManager;
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.database.Cursor;
-import android.graphics.Paint;
-import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
diff --git a/src/org/connectbot/util/HostDatabase.java b/src/org/connectbot/util/HostDatabase.java
index 4f067dc..d5d1c22 100644
--- a/src/org/connectbot/util/HostDatabase.java
+++ b/src/org/connectbot/util/HostDatabase.java
@@ -18,15 +18,11 @@
package org.connectbot.util;
-import java.util.LinkedList;
-import java.util.List;
-
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
/**
* Contains information about various SSH hosts, include public hostkey if known
diff --git a/src/org/connectbot/util/KeyDatabase.java b/src/org/connectbot/util/KeyDatabase.java
index a3d48f9..aaca3c1 100644
--- a/src/org/connectbot/util/KeyDatabase.java
+++ b/src/org/connectbot/util/KeyDatabase.java
@@ -18,12 +18,9 @@
package org.connectbot.util;
-import android.content.ContentValues;
import android.content.Context;
-import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
/**
* Contains information about personal private keys used for key-based
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 01:16:17 +0000