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

Improved logging

This commit is contained in:
M66B 2021-05-30 17:52:15 +02:00
parent 89f625603d
commit ed53a97323
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/eu/faircode/email/FragmentOAuth.java
View File

@ -24,9 +24,11 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Base64; import android.util.Base64;
@ -242,8 +244,19 @@ public class FragmentOAuth extends FragmentBase {
hideError(); hideError();
final Context context = getContext(); final Context context = getContext();
PackageManager pm = context.getPackageManager();
EmailProvider provider = EmailProvider.getProvider(context, id); EmailProvider provider = EmailProvider.getProvider(context, id);
int flags = PackageManager.GET_RESOLVED_FILTER;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
flags |= PackageManager.MATCH_ALL;
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.example.com"));
List<ResolveInfo> ris = pm.queryIntentActivities(intent, flags);
EntityLog.log(context, "Browsers=" + (ris == null ? null : ris.size()));
if (ris != null)
for (ResolveInfo ri : ris)
EntityLog.log(context, "Browser=" + ri.activityInfo.packageName);
AppAuthConfiguration appAuthConfig = new AppAuthConfiguration.Builder() AppAuthConfiguration appAuthConfig = new AppAuthConfiguration.Builder()
.setBrowserMatcher(new BrowserMatcher() { .setBrowserMatcher(new BrowserMatcher() {
@Override @Override
@ -322,7 +335,7 @@ public class FragmentOAuth extends FragmentBase {
Log.e(ex); Log.e(ex);
throw new ActivityNotFoundException("Browser not found"); throw new ActivityNotFoundException("Browser not found");
} }
PackageManager pm = context.getPackageManager();
if (authIntent.resolveActivity(pm) == null) // action whitelisted if (authIntent.resolveActivity(pm) == null) // action whitelisted
throw new ActivityNotFoundException(authIntent.toString()); throw new ActivityNotFoundException(authIntent.toString());
else else