diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-08-02 04:16:26 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-08-02 04:16:26 +0200 |
| commit | d4f2d3842b0a9e5611657ed1889154a950becc19 (patch) | |
| tree | 1d87919cbf34a7b87bbb626091f345c84d00865c /OpenKeychain/src | |
| parent | e17c1a0cd4581adce49a9941b2f4fadbdbf5a94d (diff) | |
| download | open-keychain-d4f2d3842b0a9e5611657ed1889154a950becc19.tar.gz open-keychain-d4f2d3842b0a9e5611657ed1889154a950becc19.tar.bz2 open-keychain-d4f2d3842b0a9e5611657ed1889154a950becc19.zip | |
Minor cleanup
Diffstat (limited to 'OpenKeychain/src')
4 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java index 8a516e6af..303db60ed 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -218,7 +218,6 @@ public class EncryptActivity extends DrawerActivity implements EncryptActivityIn Notify.showNotify(EncryptActivity.this, R.string.encrypt_sign_successful, Notify.Style.INFO); if (!isContentMessage() && mDeleteAfterEncrypt) { - // TODO: Create and show dialog to delete original file for (Uri inputUri : mInputUris) { DeleteFileDialogFragment deleteFileDialog = DeleteFileDialogFragment.newInstance(inputUri); deleteFileDialog.show(getSupportFragmentManager(), "deleteDialog"); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java index 27ce4faee..5e296c062 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java @@ -85,7 +85,7 @@ public class DeleteFileDialogFragment extends DialogFragment { Toast.makeText(getActivity(), getActivity().getString(R.string.error_file_delete_failed, deleteFilename), Toast.LENGTH_SHORT).show(); - // TODO: We can't delete that file... + // Note: We can't delete every file... // If possible we should find out if deletion is possible before even showing the option to do so. } }); diff --git a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml index 2f24227fa..f2caab653 100644 --- a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml +++ b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml @@ -14,7 +14,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center" - android:text="Add file(s)" + android:text="@string/btn_add_files" android:drawableLeft="@drawable/ic_action_collection" android:drawablePadding="8dp" android:gravity="center"/> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 7ad2cebdf..459c33862 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -74,6 +74,7 @@ <string name="btn_share_encrypted_signed">Share encrypted/signed message…</string> <string name="btn_view_cert_key">View certification key</string> <string name="btn_create_key">Create key</string> + <string name="btn_add_files">Add file(s)</string> <!-- menu --> <string name="menu_preferences">Settings</string> |