Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-27 08:01:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Basic OpenPGP support

Browse Source 
Fixes #43
This commit is contained in:
M66B
2018-08-25 18:26:07 +00:00
parent d8298fb615
commit d4662d1b8a
10 changed files with 230 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@@ -91,6 +91,8 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
static final int REQUEST_VIEW = 1;
static final int REQUEST_UNSEEN = 2;
static final int REQUEST_OPENPGP = 3;
static final int REQUEST_ATTACHMENT_OFFSET = 10;
static final String ACTION_VIEW_MESSAGES = BuildConfig.APPLICATION_ID + ".VIEW_MESSAGES";
static final String ACTION_VIEW_MESSAGE = BuildConfig.APPLICATION_ID + ".VIEW_MESSAGE";
@@ -692,7 +694,7 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
create.addCategory(Intent.CATEGORY_OPENABLE);
create.setType(intent.getStringExtra("type"));
create.putExtra(Intent.EXTRA_TITLE, intent.getStringExtra("name"));
startActivityForResult(create, (int) intent.getLongExtra("id", -1));
startActivityForResult(create, (int) intent.getLongExtra("id", -1) + REQUEST_ATTACHMENT_OFFSET);
} else if (ACTION_ACTIVATE_PRO.equals(intent.getAction())) {
try {
@@ -724,9 +726,9 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode == Activity.RESULT_OK) {
if (resultCode == Activity.RESULT_OK && requestCode > REQUEST_ATTACHMENT_OFFSET) {
Bundle args = new Bundle();
args.putLong("id", requestCode);
args.putLong("id", requestCode - REQUEST_ATTACHMENT_OFFSET);
args.putParcelable("uri", data.getData());
new SimpleTask<Void>() {
@Override