aboutsummaryrefslogtreecommitdiffstats
path: root/src/org/theb/ssh/Pubkey.java
diff options
context:
space:
mode:
authorJeffrey Sharkey <jsharkey@jsharkey.org>2008-08-24 23:07:29 +0000
committerJeffrey Sharkey <jsharkey@jsharkey.org>2008-08-24 23:07:29 +0000
commit5b1352c54c66fbe3307e7ff22e0543dc47f76da6 (patch)
tree5d586e4e84d8ca13f2b52a0d3ffb19e0019a72eb /src/org/theb/ssh/Pubkey.java
parent2d555d046e185b229a688817ac78e7e277e5b391 (diff)
downloadconnectbot-5b1352c54c66fbe3307e7ff22e0543dc47f76da6.tar.gz
connectbot-5b1352c54c66fbe3307e7ff22e0543dc47f76da6.tar.bz2
connectbot-5b1352c54c66fbe3307e7ff22e0543dc47f76da6.zip
* Fixing an off-by-one error in vt320 for ANSI 'U' escape sequences.Was messing up scrollback on irssi sessions.
* Filling buffer will ' ' (spaces) instead of null characters. Android's MONOSPACE font doesn't render the null correctly; might be trying to interpret them as unicode. Was messing up indentation on rtorrent sessions. * Removed SoftFont from redraw() and sped things up immensely. Everything seems to still render fine, was there a reason we needed the SoftFont? * Corrected buffer.update[] handling so we aren't repainting entire screen each time; much faster now. * Added OpenGL rendering by default, but doesn't change speed on emulator.
Diffstat (limited to 'src/org/theb/ssh/Pubkey.java')
-rw-r--r--src/org/theb/ssh/Pubkey.java14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/org/theb/ssh/Pubkey.java b/src/org/theb/ssh/Pubkey.java
index 4cfaa9c..9dffe08 100644
--- a/src/org/theb/ssh/Pubkey.java
+++ b/src/org/theb/ssh/Pubkey.java
@@ -101,19 +101,17 @@ public class Pubkey extends Activity {
};
@Override
- protected void onActivityResult(int requestCode, int resultCode,
- String data, Bundle extras)
- {
- if (requestCode == GATHER_ENTROPY) {
- entropySeed = data;
- entropyGathered.release();
- }
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode == GATHER_ENTROPY) {
+ entropySeed = data.getStringExtra(Intent.EXTRA_TEXT);
+ entropyGathered.release();
+ }
}
protected void gatherEntropy() {
generateButton.setEnabled(false);
Intent intent = new Intent(this, TouchEntropy.class);
- startSubActivity(intent, GATHER_ENTROPY);
+ this.startActivityForResult(intent, GATHER_ENTROPY);
}
OnClickListener mCommitListener = new OnClickListener() {