#211 Attachments 📎

Display correct last modified date

3 files changed, 11 insertions, 10 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java
index dea80d283..ffa22cf95 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.text.Spannable;
 import android.text.SpannableString;
-import android.text.format.DateUtils;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
@@ -90,6 +89,6 @@ public class AboutFragmentCreditsTab extends Fragment {
     }
 
     private String getLastBackgroundSyncStrongTag(long lastBackgroundSync) {
-        return strongStart + DateUtil.getRelativeDateTimeString(getContext(), lastBackgroundSync, DateUtils.SECOND_IN_MILLIS) + strongEnd;
+        return strongStart + DateUtil.getRelativeDateTimeString(getContext(), lastBackgroundSync) + strongEnd;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentAdapter.java
index f58eea80a..b1ae31989 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentAdapter.java
@@ -3,7 +3,6 @@ package it.niedermann.nextcloud.deck.ui.card;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.text.format.DateUtils;
 import android.text.format.Formatter;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -23,6 +22,7 @@ import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.Attachment;
 import it.niedermann.nextcloud.deck.model.enums.DBStatus;
+import it.niedermann.nextcloud.deck.util.DateUtil;
 import it.niedermann.nextcloud.deck.util.DeleteDialogBuilder;
 
 public class AttachmentAdapter extends RecyclerView.Adapter<AttachmentAdapter.AttachmentViewHolder> {
@@ -54,7 +54,7 @@ public class AttachmentAdapter extends RecyclerView.Adapter<AttachmentAdapter.At
     @Override
     public void onBindViewHolder(@NonNull AttachmentViewHolder holder, int position) {
         Attachment attachment = attachments.get(position);
-        holder.notSyncedYet.setVisibility(attachment.getStatusEnum() == DBStatus.UP_TO_DATE ? View.GONE: View.VISIBLE);
+        holder.notSyncedYet.setVisibility(attachment.getStatusEnum() == DBStatus.UP_TO_DATE ? View.GONE : View.VISIBLE);
         if (attachment.getMimetype().startsWith("image")) {
             // TODO Glide is currently not yet able to use SSO and fails on authentication
 //            String uri = account.getUrl() + "/index.php/apps/deck/cards/" + cardRemoteId + "/attachment/" + attachment.getId();
@@ -72,7 +72,13 @@ public class AttachmentAdapter extends RecyclerView.Adapter<AttachmentAdapter.At
         holder.filename.setText(attachment.getBasename());
         holder.filesize.setText(Formatter.formatFileSize(context, attachment.getFilesize()));
         if (attachment.getLastModifiedLocal() != null) {
-            holder.modified.setText(DateUtils.getRelativeTimeSpanString(context, attachment.getLastModifiedLocal().getTime()));
+            holder.modified.setText(DateUtil.getRelativeDateTimeString(context, attachment.getLastModifiedLocal().getTime()));
+            holder.modified.setVisibility(View.VISIBLE);
+        } else if (attachment.getLastModified() != null) {
+            holder.modified.setText(DateUtil.getRelativeDateTimeString(context, attachment.getLastModified().getTime()));
+            holder.modified.setVisibility(View.VISIBLE);
+        } else {
+            holder.modified.setVisibility(View.GONE);
         }
         holder.filename.getRootView().setOnClickListener((event) -> {
             Intent openURL = new Intent(android.content.Intent.ACTION_VIEW);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/DateUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/DateUtil.java
index dc5dc574e..5c2ffd76c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/util/DateUtil.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/DateUtil.java
@@ -56,10 +56,6 @@ public final class DateUtil {
     }
 
     public static CharSequence getRelativeDateTimeString(Context context, long time) {
-        return getRelativeDateTimeString(context, time, DateUtils.DAY_IN_MILLIS);
-    }
-
-    public static CharSequence getRelativeDateTimeString(Context context, long time, long minResolution) {
         if ((System.currentTimeMillis() - time) < 60 * 1000 && System.currentTimeMillis() > time) {
             // < 60 seconds -> seconds ago
             return context.getString(R.string.seconds_ago);
@@ -68,7 +64,7 @@ public final class DateUtil {
             CharSequence dateString = DateUtils.getRelativeDateTimeString(
                     context,
                     time,
-                    minResolution,
+                    DateUtils.SECOND_IN_MILLIS,
                     DateUtils.WEEK_IN_MILLIS,
                     0
             );