mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-27 02:07:12 +00:00
Code Issues Releases Wiki Activity

Fixed updating Graph token

Browse source
This commit is contained in:
M66B 2023-03-05 07:47:35 +01:00
parent f0c058e7b4
commit a3a5cd5844
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/DaoIdentity.java
View file

@ -119,9 +119,9 @@ public interface DaoIdentity {
" SET password = :password, auth_type = :new_auth_type, provider = :provider" +
" WHERE account = :account" +
" AND user = :user" +
" AND (auth_type = :auth_type OR auth_type = " + ServiceAuthenticator.AUTH_TYPE_GRAPH + ")" +
" AND (auth_type = :auth_type OR auth_type IS NULL)" +
" AND NOT (password IS :password AND auth_type IS :new_auth_type AND provider = :provider)")
int setIdentityPassword(long account, String user, String password, int auth_type, int new_auth_type, String provider);
int setIdentityPassword(long account, String user, String password, Integer auth_type, int new_auth_type, String provider);
@Query("UPDATE identity" +
" SET fingerprint = :fingerprint" +

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

@ -992,7 +992,7 @@ public class FragmentOAuth extends FragmentBase {
db.account().setAccountPassword(update.id, state[0], AUTH_TYPE_OAUTH, provider.id);
db.identity().setIdentityPassword(update.id, username,
state[state.length - 1],
update.auth_type,
null,
(state.length == 1 ? AUTH_TYPE_OAUTH : AUTH_TYPE_GRAPH),
provider.id);
}