awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

improve mailto Intent handling in ShareActivity

Browse Source
This commit is contained in:
adbenitez
2023-08-15 11:27:37 +02:00
parent c4a4469424
commit 39184f8a09
3 changed files with 85 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/NewConversationActivity.java
+8 -54
View File
@@ -17,7 +17,6 @@
package org.thoughtcrime.securesms;
import android.content.Intent;
import android.net.MailTo;
import android.net.Uri;
import android.os.Bundle;
import android.util.Log;
@@ -32,11 +31,7 @@ import com.b44t.messenger.DcContact;
import com.b44t.messenger.DcContext;
import org.thoughtcrime.securesms.connect.DcHelper;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;
import org.thoughtcrime.securesms.util.MailtoUtil;
import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA;
import static org.thoughtcrime.securesms.ConversationActivity.TEXT_EXTRA;
@@ -53,11 +48,6 @@ public class NewConversationActivity extends ContactSelectionActivity {
@SuppressWarnings("unused")
private static final String TAG = NewConversationActivity.class.getSimpleName();
public static final String MAILTO = "mailto";
private static final String SUBJECT = "subject";
private static final String BODY = "body";
private static final String QUERY_SEPARATOR = "&";
private static final String KEY_VALUE_SEPARATOR = "=";
@Override
public void onCreate(Bundle bundle, boolean ready) {
@@ -75,19 +65,14 @@ public class NewConversationActivity extends ContactSelectionActivity {
Uri uri = intent.getData();
if(uri != null) {
String scheme = uri.getScheme();
if(scheme != null && scheme.equals(MAILTO) ) {
String textToShare = getTextToShare(uri);
MailTo mailto = MailTo.parse(uri.toString());
String recipientsList = mailto.getTo();
if(recipientsList != null && !recipientsList.trim().isEmpty()) {
String[] recipientsArray = recipientsList.trim().split(",");
if (recipientsArray.length >= 1) {
String recipient = recipientsArray[0];
if (textToShare != null && !textToShare.isEmpty()) {
getIntent().putExtra(TEXT_EXTRA, textToShare);
}
onContactSelected(DcContact.DC_CONTACT_ID_NEW_CONTACT, recipient);
if(MailtoUtil.isMailto(uri)) {
String textToShare = MailtoUtil.getText(uri);
String[] recipientsArray = MailtoUtil.getRecipients(uri);
if (recipientsArray.length >= 1) {
if (!textToShare.isEmpty()) {
getIntent().putExtra(TEXT_EXTRA, textToShare);
}
onContactSelected(DcContact.DC_CONTACT_ID_NEW_CONTACT, recipientsArray[0]);
} else {
Intent shareIntent = new Intent(this, ShareActivity.class);
shareIntent.putExtra(Intent.EXTRA_TEXT, textToShare);
@@ -103,37 +88,6 @@ public class NewConversationActivity extends ContactSelectionActivity {
}
}
private String getTextToShare(Uri uri) {
Map<String, String> mailtoQueryMap = getMailtoQueryMap(uri);
String textToShare = mailtoQueryMap.get(SUBJECT);
String body = mailtoQueryMap.get(BODY);
if (body != null && !body.isEmpty()) {
if (textToShare != null && !textToShare.isEmpty()) {
textToShare += "\n" + body;
} else {
textToShare = body;
}
}
return textToShare;
}
private Map<String, String> getMailtoQueryMap(Uri uri) {
Map<String, String> mailtoQueryMap = new HashMap<>();
String query = uri.getEncodedQuery();
if (query != null && !query.isEmpty()) {
String[] queryArray = query.split(QUERY_SEPARATOR);
for(String queryEntry : queryArray) {
String[] queryEntryArray = queryEntry.split(KEY_VALUE_SEPARATOR);
try {
mailtoQueryMap.put(queryEntryArray[0], URLDecoder.decode(queryEntryArray[1], "UTF-8"));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
}
}
return mailtoQueryMap;
}
@Override
public void onContactSelected(int specialId, String addr) {
final DcContext dcContext = DcHelper.getContext(this);
src/org/thoughtcrime/securesms/ShareActivity.java
+13
View File
@@ -41,6 +41,7 @@ import org.thoughtcrime.securesms.permissions.Permissions;
import org.thoughtcrime.securesms.util.DynamicLanguage;
import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.MailtoUtil;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.RelayUtil;
@@ -123,6 +124,18 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity implement
streamExtras.add(uri);
} else if (getIntent().getParcelableArrayListExtra(Intent.EXTRA_STREAM) != null) {
streamExtras = getIntent().getParcelableArrayListExtra(Intent.EXTRA_STREAM);
} else {
Uri uri = getIntent().getData();
if (MailtoUtil.isMailto(uri)) {
String[] extraEmail = getIntent().getStringArrayExtra(Intent.EXTRA_EMAIL);
if (extraEmail == null || extraEmail.length == 0) {
getIntent().putExtra(Intent.EXTRA_EMAIL, MailtoUtil.getRecipients(uri));
}
String text = getIntent().getStringExtra(Intent.EXTRA_TEXT);
if (text == null || text.isEmpty()) {
getIntent().putExtra(Intent.EXTRA_TEXT, MailtoUtil.getText(uri));
}
}
}
if (needsFilePermission(streamExtras)) {
src/org/thoughtcrime/securesms/util/MailtoUtil.java
+64
View File
@@ -0,0 +1,64 @@
package org.thoughtcrime.securesms.util;
import android.net.MailTo;
import android.net.Uri;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;
public class MailtoUtil {
private static final String MAILTO = "mailto";
private static final String SUBJECT = "subject";
private static final String BODY = "body";
private static final String QUERY_SEPARATOR = "&";
private static final String KEY_VALUE_SEPARATOR = "=";
public static boolean isMailto(Uri uri) {
return uri != null && MAILTO.equals(uri.getScheme());
}
public static String[] getRecipients(Uri uri) {
String[] recipientsArray = new String[0];
if (uri != null) {
MailTo mailto = MailTo.parse(uri.toString());
String recipientsList = mailto.getTo();
if(recipientsList != null && !recipientsList.trim().isEmpty()) {
recipientsArray = recipientsList.trim().split(",");
}
}
return recipientsArray;
}
public static String getText(Uri uri) {
Map<String, String> mailtoQueryMap = getMailtoQueryMap(uri);
String textToShare = mailtoQueryMap.get(SUBJECT);
String body = mailtoQueryMap.get(BODY);
if (body != null && !body.isEmpty()) {
if (textToShare != null && !textToShare.isEmpty()) {
textToShare += "\n" + body;
} else {
textToShare = body;
}
}
return textToShare != null? textToShare : "";
}
private static Map<String, String> getMailtoQueryMap(Uri uri) {
Map<String, String> mailtoQueryMap = new HashMap<>();
String query = uri.getEncodedQuery();
if (query != null && !query.isEmpty()) {
String[] queryArray = query.split(QUERY_SEPARATOR);
for(String queryEntry : queryArray) {
String[] queryEntryArray = queryEntry.split(KEY_VALUE_SEPARATOR);
try {
mailtoQueryMap.put(queryEntryArray[0], URLDecoder.decode(queryEntryArray[1], "UTF-8"));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
}
}
return mailtoQueryMap;
}
}