mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-25 07:23:03 +00:00
Code Issues Releases Wiki Activity

Merge pull request #187 from cketti/MailToCompat

Browse source 
Replace usage of android.net.MailTo with androidx.core.net.MailTo

I just noticed you are the author of K9-Mail, so I am just going to trust you on this.
This commit is contained in:
Marcel Bokhorst 2020-11-13 07:54:46 +01:00 committed by GitHub
commit 1b38b92adb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/ActivityCompose.java
View file

@ -20,7 +20,6 @@ package eu.faircode.email;
*/ */
import android.content.Intent; import android.content.Intent;
import android.net.MailTo;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html; import android.text.Html;
@ -28,6 +27,7 @@ import android.text.Spanned;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.core.app.TaskStackBuilder; import androidx.core.app.TaskStackBuilder;
import androidx.core.net.MailTo;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
@ -89,12 +89,7 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
Uri uri = intent.getData(); Uri uri = intent.getData();
if (uri != null && "mailto".equals(uri.getScheme())) { if (uri != null && "mailto".equals(uri.getScheme())) {
// https://www.ietf.org/rfc/rfc2368.txt // https://www.ietf.org/rfc/rfc2368.txt
String url = uri.toString(); MailTo mailto = MailTo.parse(uri.toString());
int query = url.indexOf('?', MailTo.MAILTO_SCHEME.length());
if (query > 0)
url = url.substring(0, query) + url.substring(query).replace(":", "%3A");
MailTo mailto = MailTo.parse(url);
String to = mailto.getTo(); String to = mailto.getTo();
if (to != null) if (to != null)

3
app/src/main/java/eu/faircode/email/IPInfo.java
View file

@ -20,11 +20,12 @@ package eu.faircode.email;
*/ */
import android.content.Context; import android.content.Context;
import android.net.MailTo;
import android.net.ParseException; import android.net.ParseException;
import android.net.Uri; import android.net.Uri;
import android.util.Pair; import android.util.Pair;
import androidx.core.net.MailTo;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.URL; import java.net.URL;

2
app/src/main/java/eu/faircode/email/MessageHelper.java
View file

@ -21,10 +21,10 @@ package eu.faircode.email;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.net.MailTo;
import android.net.Uri; import android.net.Uri;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.core.net.MailTo;
import androidx.documentfile.provider.DocumentFile; import androidx.documentfile.provider.DocumentFile;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;