Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 03:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prepare daily Outlook contacts download

Browse Source
This commit is contained in:
M66B
2023-06-13 07:45:23 +02:00
parent fd340632dc
commit ef9bed3cd3
3 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/MicrosoftGraph.java
View File

@@ -57,7 +57,7 @@ public class MicrosoftGraph {
db.identity().setIdentityState(ident.id, "connecting");
AuthState authState = AuthState.jsonDeserialize(ident.password);
ServiceAuthenticator.OAuthRefresh(context, ident.provider, ident.auth_type, ident.user, authState, false);
ServiceAuthenticator.OAuthRefresh(context, ident.provider, ident.auth_type, ident.user, authState, true);
Long expiration = authState.getAccessTokenExpirationTime();
if (expiration != null)
EntityLog.log(context, ident.user + " token expiration=" + new Date(expiration));
@@ -124,10 +124,16 @@ public class MicrosoftGraph {
}
}
static int downloadContacts(Context context, long account, String accessToken) throws IOException, JSONException {
static int downloadContacts(Context context, long account, AuthState authState) throws IOException, JSONException, MessagingException {
int count = 0;
DB db = DB.getInstance(context);
ServiceAuthenticator.OAuthRefresh(context,
"outlookgraph", ServiceAuthenticator.AUTH_TYPE_GRAPH, "contacts", authState, BuildConfig.DEBUG);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
prefs.edit().putString("graph.contacts." + account, authState.jsonSerializeString()).apply();
// https://learn.microsoft.com/en-us/graph/api/user-list-contacts?view=graph-rest-1.0&tabs=http
URL url = new URL(MicrosoftGraph.GRAPH_ENDPOINT + "contacts");
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
@@ -135,7 +141,7 @@ public class MicrosoftGraph {
connection.setReadTimeout(GRAPH_TIMEOUT * 1000);
connection.setConnectTimeout(GRAPH_TIMEOUT * 1000);
ConnectionHelper.setUserAgent(context, connection);
connection.setRequestProperty("Authorization", "Bearer " + accessToken);
connection.setRequestProperty("Authorization", "Bearer " + authState.getAccessToken());
connection.connect();
try {