mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Moved encrypt to menu

This commit is contained in:
M66B 2018-10-28 17:16:25 +00:00
parent 435a73fcab
commit e31b3967f3
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -423,6 +423,9 @@ public class FragmentCompose extends FragmentEx {
case R.id.menu_addresses:
onMenuAddresses();
return true;
case R.id.menu_encrypt:
onAction(R.id.menu_encrypt);
return true;
default:
return super.onOptionsItemSelected(item);
}
@ -1371,7 +1374,7 @@ public class FragmentCompose extends FragmentEx {
Toast.makeText(context, R.string.title_draft_deleted, Toast.LENGTH_LONG).show();
}
});
} else if (action == R.id.action_save || action == R.id.action_encrypt) {
} else if (action == R.id.action_save || action == R.id.menu_encrypt) {
db.message().updateMessage(draft);
draft.write(context, body);
@ -1462,7 +1465,7 @@ public class FragmentCompose extends FragmentEx {
} else if (action == R.id.action_save) {
// Do nothing
} else if (action == R.id.action_encrypt) {
} else if (action == R.id.menu_encrypt) {
onEncrypt();
} else if (action == R.id.action_send) {

5
app/src/main/res/menu/action_compose.xml
View File

@ -11,11 +11,6 @@
android:icon="@drawable/baseline_save_alt_24"
android:title="@string/title_save" />
<item
android:id="@+id/action_encrypt"
android:icon="@drawable/baseline_lock_24"
android:title="@string/title_encrypt" />
<item
android:id="@+id/action_send"
android:icon="@drawable/baseline_send_24"

6
app/src/main/res/menu/menu_compose.xml
View File

@ -37,4 +37,10 @@
android:icon="@drawable/baseline_people_24"
android:title="@string/title_show_addresses"
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_encrypt"
android:icon="@drawable/baseline_lock_24"
android:title="@string/title_encrypt"
app:showAsAction="ifRoom" />
</menu>

4
app/src/main/res/values/strings.xml
View File

@ -182,7 +182,6 @@
<string name="title_reply_all">Reply to all</string>
<string name="title_show_headers">Show headers</string>
<string name="title_show_html">Show original</string>
<string name="title_decrypt">Decrypt</string>
<string name="title_trash">Trash</string>
<string name="title_delete">Delete</string>
@ -212,7 +211,6 @@
<string name="title_body_hint">Your message</string>
<string name="title_discard">Discard</string>
<string name="title_save">Save</string>
<string name="title_encrypt">Encrypt</string>
<string name="title_send">Send</string>
<string name="title_clipboard_empty">Clipboard empty</string>
@ -230,6 +228,8 @@
<string name="title_draft_saved">Draft saved</string>
<string name="title_queued">Sending message</string>
<string name="title_encrypt">Encrypt</string>
<string name="title_decrypt">Decrypt</string>
<string name="title_no_openpgp">OpenKeychain not found</string>
<string name="title_search">Search</string>