msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Improved logging

Browse Source
pull/199/head
M66B 4 years ago
parent 8026cef5af
commit 89f625603d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File

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

@ -241,7 +241,8 @@ public class FragmentOAuth extends FragmentBase {
pbOAuth.setVisibility(View.VISIBLE); pbOAuth.setVisibility(View.VISIBLE);
hideError(); hideError();
EmailProvider provider = EmailProvider.getProvider(getContext(), id); final Context context = getContext();
EmailProvider provider = EmailProvider.getProvider(context, id);
AppAuthConfiguration appAuthConfig = new AppAuthConfiguration.Builder() AppAuthConfiguration appAuthConfig = new AppAuthConfiguration.Builder()
.setBrowserMatcher(new BrowserMatcher() { .setBrowserMatcher(new BrowserMatcher() {
@ -254,7 +255,7 @@ public class FragmentOAuth extends FragmentBase {
VersionRange.atMost("5.3")); VersionRange.atMost("5.3"));
boolean accept = (!sbrowser.matches(descriptor) && boolean accept = (!sbrowser.matches(descriptor) &&
(!"gmail".equals(provider.id) || !descriptor.useCustomTab)); (!"gmail".equals(provider.id) || !descriptor.useCustomTab));
EntityLog.log(getContext(), EntityLog.log(context,
"Browser=" + descriptor.packageName + "Browser=" + descriptor.packageName +
":" + descriptor.version + ":" + descriptor.version +
":" + descriptor.useCustomTab + "" + ":" + descriptor.useCustomTab + "" +
@ -265,14 +266,14 @@ public class FragmentOAuth extends FragmentBase {
}) })
.build(); .build();
AuthorizationService authService = new AuthorizationService(getContext(), appAuthConfig); AuthorizationService authService = new AuthorizationService(context, appAuthConfig);
AuthorizationServiceConfiguration serviceConfig = new AuthorizationServiceConfiguration( AuthorizationServiceConfiguration serviceConfig = new AuthorizationServiceConfiguration(
Uri.parse(provider.oauth.authorizationEndpoint), Uri.parse(provider.oauth.authorizationEndpoint),
Uri.parse(provider.oauth.tokenEndpoint)); Uri.parse(provider.oauth.tokenEndpoint));
AuthState authState = new AuthState(serviceConfig); AuthState authState = new AuthState(serviceConfig);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
prefs.edit().putString("oauth." + provider.id, authState.jsonSerializeString()).apply(); prefs.edit().putString("oauth." + provider.id, authState.jsonSerializeString()).apply();
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
@ -313,15 +314,15 @@ public class FragmentOAuth extends FragmentBase {
AuthorizationRequest authRequest = authRequestBuilder.build(); AuthorizationRequest authRequest = authRequestBuilder.build();
Log.i("OAuth request provider=" + provider.id + " uri=" + authRequest.toUri()); EntityLog.log(context, "OAuth request provider=" + provider.id + " uri=" + authRequest.toUri());
Intent authIntent = null; Intent authIntent;
try { try {
authIntent = authService.getAuthorizationRequestIntent(authRequest); authIntent = authService.getAuthorizationRequestIntent(authRequest);
} catch (ActivityNotFoundException ex) { } catch (ActivityNotFoundException ex) {
Log.e(ex); Log.e(ex);
throw new ActivityNotFoundException("Browser not found: " + ex.getMessage()); throw new ActivityNotFoundException("Browser not found");
} }
PackageManager pm = getContext().getPackageManager(); 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

Write Preview
Loading…
Cancel
Save