From 8b50ce0b2a00eb6bb12641cb4bdd0f1a1dc63035 Mon Sep 17 00:00:00 2001 From: tom79 Date: Mon, 3 Jun 2019 07:42:46 +0200 Subject: [PATCH] Fix crash + add gab.ai block --- .../main/java/app/fedilab/android/activities/LoginActivity.java | 2 +- .../app/fedilab/android/fragments/DisplayStatusFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java index 09f363c36..e5db8ece8 100644 --- a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java @@ -273,7 +273,7 @@ public class LoginActivity extends BaseActivity { return; } instance = login_instance.getText().toString().trim().toLowerCase(); - if(instance.endsWith(".gab.com") || instance.equals("gab.com")){ + if(instance.endsWith(".gab.com") || instance.equals("gab.com") || instance.endsWith(".gab.ai") || instance.equals("gab.ai")){ Toasty.error(LoginActivity.this,getString(R.string.client_error), Toast.LENGTH_LONG).show(); return; } diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java index 22609f1d3..4061889dc 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java @@ -954,7 +954,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn ArrayList tmpStatuses = new ArrayList<>(); for (Status tmpStatus : statuses) { //Put the toot at its place in the list (id desc) - if( !apiResponse.isFetchmore() && !this.statuses.contains(tmpStatus) && tmpStatus.getCreated_at() != null && this.statuses.get(0).getCreated_at() != null && tmpStatus.getCreated_at().after(this.statuses.get(0).getCreated_at())) { //Element not already added + if( !apiResponse.isFetchmore() && this.statuses.size() > 0 && !this.statuses.contains(tmpStatus) && tmpStatus.getCreated_at() != null && this.statuses.get(0).getCreated_at() != null && tmpStatus.getCreated_at().after(this.statuses.get(0).getCreated_at())) { //Element not already added //Mark status at new ones when their id is greater than the last read toot id if (type == RetrieveFeedsAsyncTask.Type.HOME && lastReadTootDate != null && tmpStatus.getCreated_at().after(lastReadTootDate) ) { tmpStatus.setNew(true);