Bläddra i källkod

Fix time

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 8 år sedan
förälder
incheckning
9631859548
1 ändrade filer med 11 tillägg och 2 borttagningar
  1. 11 2
      src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java

+ 11 - 2
src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java

@@ -91,8 +91,17 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         String sTime = "";
         for (Object o : activityItems) {
             Activity activity = (Activity) o;
-            String time = DisplayUtils.getRelativeTimestamp(context,
-                    activity.getDatetime().getTime()).toString();
+            String time = null;
+            if (activity.getDatetime() != null) {
+                time = DisplayUtils.getRelativeTimestamp(context,
+                        activity.getDatetime().getTime()).toString();
+            } else if (activity.getDate() != null) {
+                time = DisplayUtils.getRelativeTimestamp(context,
+                        activity.getDate().getTime()).toString();
+            } else {
+                time = "Unknown";
+            }
+
             if (sTime.equalsIgnoreCase(time)) {
                 mValues.add(activity);
             } else {