owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move unauthenticatedApiController

Browse Source 
The constructor of AccountSessionManager may need this object which
could lead to a situation where it was being used before it had been
created.
Making it static and moving it to MastodonAPIRequest, the only place it
was being used anyways, seems to fix the issue.
This commit is contained in:
Jacocococo
2024-03-29 14:38:06 +01:00
parent 2856e99569
commit 86b6adf228
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java
View File

@@ -37,6 +37,8 @@ import okhttp3.Response;
public abstract class MastodonAPIRequest<T> extends APIRequest<T>{ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
private static final String TAG="MastodonAPIRequest"; private static final String TAG="MastodonAPIRequest";
private static MastodonAPIController unauthenticatedApiController=new MastodonAPIController(null);
private String domain; private String domain;
private AccountSession account; private AccountSession account;
private String path; private String path;
@@ -95,14 +97,14 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
public MastodonAPIRequest<T> execNoAuth(String domain){ public MastodonAPIRequest<T> execNoAuth(String domain){
this.domain=domain; this.domain=domain;
AccountSessionManager.getInstance().getUnauthenticatedApiController().submitRequest(this); unauthenticatedApiController.submitRequest(this);
return this; return this;
} }
public MastodonAPIRequest<T> exec(String domain, Token token){ public MastodonAPIRequest<T> exec(String domain, Token token){
this.domain=domain; this.domain=domain;
this.token=token; this.token=token;
AccountSessionManager.getInstance().getUnauthenticatedApiController().submitRequest(this); unauthenticatedApiController.submitRequest(this);
return this; return this;
} }

6
mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
View File

@@ -72,7 +72,6 @@ public class AccountSessionManager{
private HashMap<String, List<EmojiCategory>> customEmojis=new HashMap<>(); private HashMap<String, List<EmojiCategory>> customEmojis=new HashMap<>();
private HashMap<String, Long> instancesLastUpdated=new HashMap<>(); private HashMap<String, Long> instancesLastUpdated=new HashMap<>();
private HashMap<String, Instance> instances=new HashMap<>(); private HashMap<String, Instance> instances=new HashMap<>();
private MastodonAPIController unauthenticatedApiController=new MastodonAPIController(null);
private Instance authenticatingInstance; private Instance authenticatingInstance;
private Application authenticatingApp; private Application authenticatingApp;
private String lastActiveAccountID; private String lastActiveAccountID;
@@ -232,11 +231,6 @@ public class AccountSessionManager{
maybeUpdateShortcuts(); maybeUpdateShortcuts();
} }
@NonNull
public MastodonAPIController getUnauthenticatedApiController(){
return unauthenticatedApiController;
}
public void authenticate(Activity activity, Instance instance){ public void authenticate(Activity activity, Instance instance){
authenticatingInstance=instance; authenticatingInstance=instance;
new CreateOAuthApp() new CreateOAuthApp()