From e2b653ca7025fb40a7efbb91bec493672d041c29 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sat, 4 Jul 2020 16:41:15 +0200
Subject: [PATCH] changes

---
 app/build.gradle                                         | 1 +
 app/src/main/assets/changelogs/373.txt                   | 1 +
 .../app/fedilab/android/activities/LoginActivity.java    | 3 ++-
 .../android/asynctasks/RetrieveFeedsAsyncTask.java       | 4 ++++
 .../asynctasks/RetrieveNotificationsCacheAsyncTask.java  | 5 +++++
 app/src/main/res/layout/add_filter.xml                   | 9 +++++----
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4804f4692..f1f937571 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -117,6 +117,7 @@ dependencies {
     implementation "info.guardianproject.netcipher:netcipher:2.0.0-alpha1"
     implementation "info.guardianproject.netcipher:netcipher-okhttp3:2.0.0-alpha1"
 
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation  'com.github.adrielcafe:AndroidAudioRecorder:0.3.0'
     implementation 'yogesh.firzen:MukkiyaSevaigal:1.0.6'
     implementation 'com.iceteck.silicompressorr:silicompressor:2.2.2'
diff --git a/app/src/main/assets/changelogs/373.txt b/app/src/main/assets/changelogs/373.txt
index 64a5156c0..98257901a 100644
--- a/app/src/main/assets/changelogs/373.txt
+++ b/app/src/main/assets/changelogs/373.txt
@@ -8,4 +8,5 @@ changed:
 Fixed:
 - Remove extra spaces at the bottom of messages
 - Some issue with custom emoji
+- Fix issue with "Your toots/notifications"
 - Some crashes
\ No newline at end of file
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 5207547ff..c3b38f8b0 100644
--- a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java
@@ -169,7 +169,8 @@ public class LoginActivity extends BaseActivity {
                     e.printStackTrace();
                 }
             }).start();
-        } else {
+        }
+        else {
 
             SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
             int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
index aa8953d25..bd65ebd2f 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
@@ -30,6 +30,7 @@ import app.fedilab.android.client.Entities.Peertube;
 import app.fedilab.android.client.Entities.RemoteInstance;
 import app.fedilab.android.client.Entities.Results;
 import app.fedilab.android.client.Entities.RetrieveFeedsParam;
+import app.fedilab.android.client.Entities.Status;
 import app.fedilab.android.client.GNUAPI;
 import app.fedilab.android.client.PeertubeAPI;
 import app.fedilab.android.helper.FilterToots;
@@ -387,6 +388,9 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
                 db = Sqlite.getInstance(contextReference.get().getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
                 statuses = new StatusCacheDAO(contextReference.get(), db).getStatusFromID(StatusCacheDAO.ARCHIVE_CACHE, filterToots, max_id);
                 if (statuses != null && statuses.size() > 0) {
+                    for (app.fedilab.android.client.Entities.Status status: statuses) {
+                        app.fedilab.android.client.Entities.Status.fillSpan(contextReference, status);
+                    }
                     apiResponse.setStatuses(statuses);
                     apiResponse.setSince_id(statuses.get(0).getId());
                     apiResponse.setMax_id(statuses.get(statuses.size() - 1).getId());
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveNotificationsCacheAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveNotificationsCacheAsyncTask.java
index f811763e8..9435b8483 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveNotificationsCacheAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveNotificationsCacheAsyncTask.java
@@ -57,6 +57,11 @@ public class RetrieveNotificationsCacheAsyncTask extends AsyncTask<Void, Void, V
         apiResponse = new APIResponse();
         apiResponse.setNotifications(notifications);
         if (notifications != null && notifications.size() > 0) {
+            for (Notification notification: notifications) {
+                if( notification.getStatus() != null) {
+                    app.fedilab.android.client.Entities.Status.fillSpan(contextReference, notification.getStatus());
+                }
+            }
             apiResponse.setMax_id(notifications.get(notifications.size() - 1).getId());
         }
         return null;
diff --git a/app/src/main/res/layout/add_filter.xml b/app/src/main/res/layout/add_filter.xml
index c4593280c..dd38332b7 100644
--- a/app/src/main/res/layout/add_filter.xml
+++ b/app/src/main/res/layout/add_filter.xml
@@ -18,13 +18,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:padding="10dp">
 
         <TextView
+            android:labelFor="@+id/add_phrase"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/filter_keyword" />
@@ -41,7 +42,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="text"
-            android:singleLine="true" />
+            android:singleLine="true"
+            android:importantForAutofill="no" />
 
         <TextView
             android:layout_width="match_parent"
@@ -151,8 +153,7 @@
                 android:id="@+id/filter_expire"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="30dp"
-                android:layout_marginLeft="30dp" />
+                android:layout_marginStart="30dp" />
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file