diff options
| author | Thomas <tschneider.ac@gmail.com> | 2022-11-20 09:45:05 +0100 |
|---|---|---|
| committer | Thomas <tschneider.ac@gmail.com> | 2022-11-20 09:45:05 +0100 |
| commit | 3a3f6aa3479ab2b139828dcbd709a2738b6f1504 (patch) | |
| tree | c7b388c55f2250fa3bdce92aca9bc865e15751ad /app | |
| parent | 9d8c815a1aa82238c8c61afc30485a795af28e22 (diff) | |
Fix issue #493 - Crash when adding account to a list from profile
Diffstat (limited to 'app')
3 files changed, 6 insertions, 5 deletions
diff --git a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java index 0384c8723..a307495c9 100644 --- a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java @@ -875,7 +875,7 @@ public class ProfileActivity extends BaseActivity { updateAccount(); if (isChecked) { timelinesVM.addAccountsList(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, listsId[which], userIds).observe(ProfileActivity.this, success -> { - if (!success) { + if (success == null || !success) { Toasty.error(ProfileActivity.this, getString(R.string.toast_error_add_to_list), Toast.LENGTH_LONG).show(); } }); @@ -886,7 +886,7 @@ public class ProfileActivity extends BaseActivity { } else { if (isChecked) { timelinesVM.addAccountsList(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, listsId[which], userIds).observe(ProfileActivity.this, success -> { - if (!success) { + if (success == null || !success) { Toasty.error(ProfileActivity.this, getString(R.string.toast_error_add_to_list), Toast.LENGTH_LONG).show(); } }); diff --git a/app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java b/app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java index e09c70c63..7fdf07447 100644 --- a/app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java +++ b/app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java @@ -179,7 +179,7 @@ public interface MastodonTimelinesService { //Add account in a list @FormUrlEncoded @POST("lists/{id}/accounts") - Call<Boolean> addAccountsList( + Call<Void> addAccountsList( @Header("Authorization") String token, @Path("id") String id, @Field("account_ids[]") List<String> account_ids diff --git a/app/src/main/java/app/fedilab/android/viewmodel/mastodon/TimelinesVM.java b/app/src/main/java/app/fedilab/android/viewmodel/mastodon/TimelinesVM.java index 19e5b498f..b3fff9571 100644 --- a/app/src/main/java/app/fedilab/android/viewmodel/mastodon/TimelinesVM.java +++ b/app/src/main/java/app/fedilab/android/viewmodel/mastodon/TimelinesVM.java @@ -843,14 +843,15 @@ public class TimelinesVM extends AndroidViewModel { MastodonTimelinesService mastodonTimelinesService = init(instance); booleanMutableLiveData = new MutableLiveData<>(); new Thread(() -> { - Call<Boolean> addAccountsListCall = mastodonTimelinesService.addAccountsList(token, listId, accountIds); + Call<Void> addAccountsListCall = mastodonTimelinesService.addAccountsList(token, listId, accountIds); Boolean reply = null; if (addAccountsListCall != null) { try { - Response<Boolean> response = addAccountsListCall.execute(); + Response<Void> response = addAccountsListCall.execute(); reply = response.isSuccessful(); } catch (Exception e) { e.printStackTrace(); + reply = false; } } Handler mainHandler = new Handler(Looper.getMainLooper()); |