cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

by default show the undecrypted block without line wrapping, just feels less messy, switch after decryption

Browse Source
This commit is contained in:
Thialfihar
2010-06-02 10:20:41 +00:00
parent aea1902591
commit 72b899fa79
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/decrypt.xml
View File

@@ -77,6 +77,7 @@
<EditText <EditText
android:id="@+id/message" android:id="@+id/message"
android:inputType="text|textCapSentences|textMultiLine|textLongMessage" android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
android:scrollHorizontally="true"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:gravity="top"/> android:gravity="top"/>

6
src/org/thialfihar/android/apg/DecryptActivity.java
View File

@@ -171,7 +171,7 @@ public class DecryptActivity extends BaseActivity {
byteOut.write(bytes, 0, length); byteOut.write(bytes, 0, length);
} }
byteOut.close(); byteOut.close();
String data = Strings.fromUTF8ByteArray(byteOut.toByteArray()); String data = new String(byteOut.toByteArray());
mMessage.setText(data); mMessage.setText(data);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
// ignore, then // ignore, then
@@ -542,8 +542,10 @@ public class DecryptActivity extends BaseActivity {
Toast.makeText(this, R.string.decryptionSuccessful, Toast.LENGTH_SHORT).show(); Toast.makeText(this, R.string.decryptionSuccessful, Toast.LENGTH_SHORT).show();
switch (mDecryptTarget) { switch (mDecryptTarget) {
case Id.target.message: { case Id.target.message: {
String decryptedMessage = Strings.fromUTF8ByteArray(data.getByteArray(Apg.EXTRA_DECRYPTED_MESSAGE)); String decryptedMessage =
new String(data.getByteArray(Apg.EXTRA_DECRYPTED_MESSAGE));
mMessage.setText(decryptedMessage); mMessage.setText(decryptedMessage);
mMessage.setHorizontallyScrolling(false);
mReplyButton.setVisibility(View.VISIBLE); mReplyButton.setVisibility(View.VISIBLE);
break; break;
} }