Mastodon
/
mastodon-app-ufficiale-android
mirror of https://github.com/mastodon/mastodon-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into donations

This commit is contained in:
Grishka 2024-04-21 18:11:32 +03:00
parent 79087e3c86 b0c77d42c0
commit ea53200e23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
View File

@ -123,8 +123,10 @@ public class MastodonAPIController{
@Override @Override
public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException{ public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException{
if(req.canceled) if(req.canceled){
response.close();
return; return;
}
if(BuildConfig.DEBUG) if(BuildConfig.DEBUG)
Log.d(TAG, logTag(session)+hreq+" received response: "+response); Log.d(TAG, logTag(session)+hreq+" received response: "+response);
synchronized(req){ synchronized(req){

4
mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
View File

@ -316,8 +316,10 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
loadingInstanceRedirectRequest=null; loadingInstanceRedirectRequest=null;
loadingInstanceDomain=null; loadingInstanceDomain=null;
Activity a=getActivity(); Activity a=getActivity();
if(a==null) if(a==null) {
response.close();
return; return;
}
try(response){ try(response){
if(!response.isSuccessful()){ if(!response.isSuccessful()){
a.runOnUiThread(()->{ a.runOnUiThread(()->{