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

Fix

This commit is contained in:
M66B 2019-04-11 13:21:29 +02:00
parent 19a407cf31
commit a21b4b03af
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1725,6 +1725,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (link.length != 0) { if (link.length != 0) {
String url = link[0].getURL(); String url = link[0].getURL();
Uri uri = Uri.parse(url); Uri uri = Uri.parse(url);
if (uri.getScheme() == null)
uri = Uri.parse("https://" + url);
onOpenLink(uri); onOpenLink(uri);
return true; return true;
} }
@ -1768,11 +1770,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override @Override
protected String onExecute(Context context, Bundle args) throws Throwable { protected String onExecute(Context context, Bundle args) throws Throwable {
Uri uri = args.getParcelable("uri"); Uri uri = args.getParcelable("uri");
String host; String host = uri.getHost();
if (TextUtils.isEmpty(uri.getScheme()))
host = Uri.parse("https://" + uri.toString()).getHost();
else
host = uri.getHost();
return (TextUtils.isEmpty(host) ? null : Helper.getOrganization(host)); return (TextUtils.isEmpty(host) ? null : Helper.getOrganization(host));
} }

1
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -630,7 +630,6 @@ public class FragmentMessages extends FragmentBase {
if (!Helper.getNetworkState(context).isSuitable()) if (!Helper.getNetworkState(context).isSuitable())
throw new IllegalArgumentException(context.getString(R.string.title_no_internet)); throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
try { try {
db.beginTransaction(); db.beginTransaction();