diff options
author | Kenny Root <kenny@the-b.org> | 2009-01-24 14:36:49 +0000 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2009-01-24 14:36:49 +0000 |
commit | e63ffdd0bc2ff5c5c8d648109cdacc1c601563d1 (patch) | |
tree | 9c3b177d2bbe6772216b73ab84f11c3a73a5f561 /src/org | |
parent | 370d4a0b3b3622b6036a18d028b6c48bcd7e43c6 (diff) | |
download | connectbot-e63ffdd0bc2ff5c5c8d648109cdacc1c601563d1.tar.gz connectbot-e63ffdd0bc2ff5c5c8d648109cdacc1c601563d1.tar.bz2 connectbot-e63ffdd0bc2ff5c5c8d648109cdacc1c601563d1.zip |
Code cleanup, pass 2
Diffstat (limited to 'src/org')
-rw-r--r-- | src/org/connectbot/GeneratePubkeyActivity.java | 5 | ||||
-rw-r--r-- | src/org/connectbot/HostEditorActivity.java | 5 | ||||
-rw-r--r-- | src/org/connectbot/HostListActivity.java | 16 | ||||
-rw-r--r-- | src/org/connectbot/PortForwardListActivity.java | 9 | ||||
-rw-r--r-- | src/org/connectbot/PubkeyListActivity.java | 3 | ||||
-rw-r--r-- | src/org/connectbot/bean/PortForwardBean.java | 4 | ||||
-rw-r--r-- | src/org/connectbot/bean/SelectionArea.java | 2 | ||||
-rw-r--r-- | src/org/connectbot/service/FontSizeChangedListener.java | 4 | ||||
-rw-r--r-- | src/org/connectbot/service/TerminalBridge.java | 67 | ||||
-rw-r--r-- | src/org/connectbot/service/TerminalManager.java | 5 | ||||
-rw-r--r-- | src/org/connectbot/util/PubkeyUtils.java | 3 |
11 files changed, 66 insertions, 57 deletions
diff --git a/src/org/connectbot/GeneratePubkeyActivity.java b/src/org/connectbot/GeneratePubkeyActivity.java index 9408cb0..4a4df1a 100644 --- a/src/org/connectbot/GeneratePubkeyActivity.java +++ b/src/org/connectbot/GeneratePubkeyActivity.java @@ -138,11 +138,12 @@ public class GeneratePubkeyActivity extends Activity implements OnEntropyGathere // 2048 than 2043 bits. int leftover = progress % 8; + int ourProgress = progress; if (leftover > 0) - progress += 8 - leftover; + ourProgress += 8 - leftover; - bits = minBits + progress; + bits = minBits + ourProgress; bitsText.setText(String.valueOf(bits)); } diff --git a/src/org/connectbot/HostEditorActivity.java b/src/org/connectbot/HostEditorActivity.java index d5ed0db..7d35f43 100644 --- a/src/org/connectbot/HostEditorActivity.java +++ b/src/org/connectbot/HostEditorActivity.java @@ -52,11 +52,10 @@ public class HostEditorActivity extends PreferenceActivity implements OnSharedPr this.table = table; this.id = id; - this.cacheValues(); - + cacheValues(); } - protected void cacheValues() { + protected final void cacheValues() { // fill a cursor and cache the values locally // this makes sure we dont have any floating cursor to dispose later diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java index 1988431..5b00a7b 100644 --- a/src/org/connectbot/HostListActivity.java +++ b/src/org/connectbot/HostListActivity.java @@ -133,9 +133,7 @@ public class HostListActivity extends ListActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - - switch(requestCode) { - case REQUEST_EULA: + if (requestCode == REQUEST_EULA) { if(resultCode == Activity.RESULT_OK) { // yay they agreed, so store that info Editor edit = prefs.edit(); @@ -145,17 +143,11 @@ public class HostListActivity extends ListActivity { // user didnt agree, so close this.finish(); } - break; - - case REQUEST_EDIT: + } else if (requestCode == REQUEST_EDIT) { this.updateList(); - break; - } - } - protected boolean makingShortcut = false; @Override @@ -463,7 +455,9 @@ public class HostListActivity extends ListActivity { return STATE_UNKNOWN; } - public View getView(int position, View view, ViewGroup parent) { + @Override + public View getView(int position, View origView, ViewGroup parent) { + View view = origView; if (view == null) view = inflater.inflate(R.layout.item_host, null, false); diff --git a/src/org/connectbot/PortForwardListActivity.java b/src/org/connectbot/PortForwardListActivity.java index 656aa28..2cd6a57 100644 --- a/src/org/connectbot/PortForwardListActivity.java +++ b/src/org/connectbot/PortForwardListActivity.java @@ -33,6 +33,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.ServiceConnection; +import android.database.SQLException; import android.graphics.Paint; import android.os.Bundle; import android.os.Handler; @@ -214,7 +215,7 @@ public class PortForwardListActivity extends ListActivity { } if (!hostdb.savePortForward(pfb)) - throw new Exception("Could not save port forward"); + throw new SQLException("Could not save port forward"); updateHandler.sendEmptyMessage(-1); } catch (Exception e) { @@ -304,7 +305,7 @@ public class PortForwardListActivity extends ListActivity { } if (!hostdb.savePortForward(pfb)) - throw new Exception("Could not save port forward"); + throw new SQLException("Could not save port forward"); updateHandler.sendEmptyMessage(-1); } catch (Exception e) { @@ -376,7 +377,9 @@ public class PortForwardListActivity extends ListActivity { this.portForwards = portForwards; } - public View getView(int position, View view, ViewGroup parent) { + @Override + public View getView(int position, View origView, ViewGroup parent) { + View view = origView; if (view == null) view = inflater.inflate(R.layout.item_portforward, null, false); diff --git a/src/org/connectbot/PubkeyListActivity.java b/src/org/connectbot/PubkeyListActivity.java index 8e89a89..1569722 100644 --- a/src/org/connectbot/PubkeyListActivity.java +++ b/src/org/connectbot/PubkeyListActivity.java @@ -532,7 +532,8 @@ public class PubkeyListActivity extends ListActivity implements EventListener { this.pubkeys = pubkeys; } - public View getView(int position, View view, ViewGroup parent) { + public View getView(int position, View origView, ViewGroup parent) { + View view = origView; if (view == null) view = inflater.inflate(R.layout.item_pubkey, null, false); diff --git a/src/org/connectbot/bean/PortForwardBean.java b/src/org/connectbot/bean/PortForwardBean.java index d497d2c..7fd7737 100644 --- a/src/org/connectbot/bean/PortForwardBean.java +++ b/src/org/connectbot/bean/PortForwardBean.java @@ -71,7 +71,7 @@ public class PortForwardBean extends AbstractBean { this.type = type; this.sourcePort = Integer.parseInt(source); - this.setDest(dest); + setDest(dest); } public String getBeanName() { @@ -137,7 +137,7 @@ public class PortForwardBean extends AbstractBean { /** * @param dest The destination in "host:port" format */ - public void setDest(String dest) { + public final void setDest(String dest) { String[] destSplit = dest.split(":"); this.destAddr = destSplit[0]; if (destSplit.length > 1) diff --git a/src/org/connectbot/bean/SelectionArea.java b/src/org/connectbot/bean/SelectionArea.java index 6cb7f4c..0024494 100644 --- a/src/org/connectbot/bean/SelectionArea.java +++ b/src/org/connectbot/bean/SelectionArea.java @@ -38,7 +38,7 @@ public class SelectionArea { reset(); } - public void reset() { + public final void reset() { top = left = bottom = right = 0; selectingOrigin = true; } diff --git a/src/org/connectbot/service/FontSizeChangedListener.java b/src/org/connectbot/service/FontSizeChangedListener.java index a357b6c..2528d0c 100644 --- a/src/org/connectbot/service/FontSizeChangedListener.java +++ b/src/org/connectbot/service/FontSizeChangedListener.java @@ -1,5 +1,5 @@ /** - * + * */ package org.connectbot.service; @@ -13,5 +13,5 @@ public interface FontSizeChangedListener { * @param size * new font size */ - public void onFontSizeChanged(float size); + void onFontSizeChanged(float size); } diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java index 4933db3..893a3a1 100644 --- a/src/org/connectbot/service/TerminalBridge.java +++ b/src/org/connectbot/service/TerminalBridge.java @@ -130,7 +130,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal public VDUBuffer buffer = null; private TerminalView parent = null; - private Canvas canvas = new Canvas(); + private final Canvas canvas = new Canvas(); private int metaState = 0; @@ -147,7 +147,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal public final static int META_CTRL_MASK = META_CTRL_ON | META_CTRL_LOCK; public final static int META_ALT_MASK = META_ALT_ON | META_ALT_LOCK; public final static int META_SHIFT_MASK = META_SHIFT_ON | META_SHIFT_LOCK; - + // All the transient key codes public final static int META_TRANSIENT = META_CTRL_ON | META_ALT_ON | META_SHIFT_ON; @@ -166,7 +166,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal private String keymode = null; private boolean selectingForCopy = false; - private SelectionArea selectionArea; + private final SelectionArea selectionArea; private ClipboardManager clipboard; protected KeyCharacterMap keymap = KeyCharacterMap.load(KeyCharacterMap.BUILT_IN_KEYBOARD); @@ -177,9 +177,9 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal private float fontSize = -1; - private List<FontSizeChangedListener> fontSizeChangedListeners; + private final List<FontSizeChangedListener> fontSizeChangedListeners; - private List<String> localOutput; + private final List<String> localOutput; /** * Flag indicating if we should perform a full-screen redraw during our next @@ -198,12 +198,13 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal * */ private final class Relay implements Runnable { - public void run() { - final String encoding = host.getEncoding(); + final String encoding = host.getEncoding(); - byte[] b = new byte[BUFFER_SIZE]; + public void run() { + final byte[] b = new byte[BUFFER_SIZE]; + final byte[] tmpBuff = new byte[BUFFER_SIZE]; - Charset charset = Charset.forName(encoding); + final Charset charset = Charset.forName(encoding); /* Set up character set decoder to report any byte sequences * which are malformed so we can try to resume decoding it @@ -212,11 +213,11 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal * UTF-8 byte sequences have a tendency to get truncated at * times. */ - CharsetDecoder cd = charset.newDecoder(); + final CharsetDecoder cd = charset.newDecoder(); cd.onUnmappableCharacter(CodingErrorAction.REPLACE); cd.onMalformedInput(CodingErrorAction.REPORT); - CharsetDecoder replacer = charset.newDecoder(); + final CharsetDecoder replacer = charset.newDecoder(); replacer.onUnmappableCharacter(CodingErrorAction.REPLACE); replacer.onMalformedInput(CodingErrorAction.REPLACE); @@ -274,9 +275,8 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal */ offset = n - bb.position() + cr.length(); if ((bb.position() - cr.length()) < offset) { - byte tmp[] = new byte[offset]; - System.arraycopy(b, bb.position() - cr.length(), tmp, 0, offset); - System.arraycopy(tmp, 0, b, 0, offset); + System.arraycopy(b, bb.position() - cr.length(), tmpBuff, 0, offset); + System.arraycopy(tmpBuff, 0, b, 0, offset); } else { System.arraycopy(b, bb.position() - cr.length(), b, 0, offset); } @@ -327,7 +327,8 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal public class HostKeyVerifier implements ServerHostKeyVerifier { - public boolean verifyServerHostKey(String hostname, int port, String serverHostKeyAlgorithm, byte[] serverHostKey) throws Exception { + public boolean verifyServerHostKey(String hostname, int port, + String serverHostKeyAlgorithm, byte[] serverHostKey) throws IOException { // read in all known hosts from hostdb KnownHosts hosts = manager.hostdb.getKnownHosts(); @@ -381,10 +382,10 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal manager.hostdb.saveKnownHost(hostname, port, serverHostKeyAlgorithm, serverHostKey); } return result.booleanValue(); - } - - return false; + default: + return false; + } } } @@ -394,7 +395,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal * launch thread to start SSH connection and handle any hostkey verification * and password authentication. */ - public TerminalBridge(final TerminalManager manager, final HostBean host) throws Exception { + public TerminalBridge(final TerminalManager manager, final HostBean host) throws IOException { this.manager = manager; this.host = host; @@ -420,20 +421,23 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal // create terminal buffer and handle outgoing data // this is probably status reply information buffer = new vt320() { + @Override public void write(byte[] b) { try { - stdin.write(b); + if (b != null) + stdin.write(b); } catch (IOException e) { Log.e(TAG, "Problem handling incoming data in vt320() thread", e); - } catch (NullPointerException npe) { - // TODO buffer input? - Log.d(TAG, "Input before we were connected discarded"); } } + // We don't use telnet sequences. + @Override public void sendTelnetCommand(byte cmd) { } + // We don't want remote to resize our window. + @Override public void setWindowSize(int c, int r) { } }; @@ -655,7 +659,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal /** * Handle challenges from keyboard-interactive authentication mode. */ - public String[] replyToChallenge(String name, String instruction, int numPrompts, String[] prompt, boolean[] echo) throws Exception { + public String[] replyToChallenge(String name, String instruction, int numPrompts, String[] prompt, boolean[] echo) { String[] responses = new String[numPrompts]; for(int i = 0; i < numPrompts; i++) { // request response from user for each prompt @@ -668,7 +672,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal * Convenience method for writing a line into the underlying MUD buffer. * Should never be called once the session is established. */ - protected void outputLine(String line) { + protected final void outputLine(String line) { if (session != null) Log.e(TAG, "Session established, cannot use outputLine!", new IOException("outputLine call traceback")); @@ -954,6 +958,8 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal case KeyEvent.KEYCODE_ALT_LEFT: metaPress(META_ALT_ON); return true; + default: + break; } } else if("Use left-side keys".equals(keymode)) { switch(keyCode) { @@ -969,6 +975,8 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal case KeyEvent.KEYCODE_ALT_RIGHT: metaPress(META_ALT_ON); return true; + default: + break; } } @@ -1168,7 +1176,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal * Request a different font size. Will make call to parentChanged() to make * sure we resize PTY if needed. */ - private void setFontSize(float size) { + private final void setFontSize(float size) { if (size <= 0.0) return; @@ -1195,7 +1203,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal /** * Add an {@link FontSizeChangedListener} to the list of listeners for this * bridge. - * + * * @param listener * listener to add */ @@ -1218,7 +1226,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal * parent, or maybe it's an updated font size. We should recalculate * terminal size information and request a PTY resize. */ - public synchronized void parentChanged(TerminalView parent) { + public final synchronized void parentChanged(TerminalView parent) { this.parent = parent; int width = parent.getWidth(); int height = parent.getHeight(); @@ -1407,6 +1415,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal parent.postInvalidate(); } + // We don't have a scroll bar. public void updateScrollBar() { } @@ -1674,7 +1683,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal color[index] = 0xff000000 | red << 16 | green << 8 | blue; } - public void resetColors() { + public final void resetColors() { color = new int[] { 0xff000000, // black 0xffcc0000, // red diff --git a/src/org/connectbot/service/TerminalManager.java b/src/org/connectbot/service/TerminalManager.java index 58a2280..8eb5c3e 100644 --- a/src/org/connectbot/service/TerminalManager.java +++ b/src/org/connectbot/service/TerminalManager.java @@ -18,6 +18,7 @@ package org.connectbot.service; +import java.io.IOException; import java.security.PrivateKey; import java.security.PublicKey; import java.util.HashMap; @@ -152,10 +153,10 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen /** * Open a new SSH session using the given parameters. */ - private void openConnection(HostBean host) throws Exception { + private void openConnection(HostBean host) throws IllegalArgumentException, IOException { // throw exception if terminal already open if (findBridge(host) != null) { - throw new Exception("Connection already open for that nickname"); + throw new IllegalArgumentException("Connection already open for that nickname"); } TerminalBridge bridge = new TerminalBridge(this, host); diff --git a/src/org/connectbot/util/PubkeyUtils.java b/src/org/connectbot/util/PubkeyUtils.java index a564c5f..3f4220e 100644 --- a/src/org/connectbot/util/PubkeyUtils.java +++ b/src/org/connectbot/util/PubkeyUtils.java @@ -247,7 +247,8 @@ public class PubkeyUtils { * OpenSSH compatibility methods */ - public static String convertToOpenSSHFormat(PublicKey pk, String nickname) throws IOException, InvalidKeyException { + public static String convertToOpenSSHFormat(PublicKey pk, String origNickname) throws IOException, InvalidKeyException { + String nickname = origNickname; if (nickname == null) nickname = "connectbot@android"; |