Browse Source

Hopefully add support for pre-12

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 8 years ago
parent
commit
0f53e5043f

+ 6 - 1
src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java

@@ -132,11 +132,16 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                         new Date().getTime()));
                         new Date().getTime()));
             }
             }
 
 
-            if (!TextUtils.isEmpty(activity.getSubject())) {
+            if (activity.getRichSubjectElement() != null &&
+                    !TextUtils.isEmpty(activity.getRichSubjectElement().getRichSubject())) {
+                activityViewHolder.subject.setVisibility(View.VISIBLE);
                 activityViewHolder.subject.setMovementMethod(LinkMovementMethod.getInstance());
                 activityViewHolder.subject.setMovementMethod(LinkMovementMethod.getInstance());
                 activityViewHolder.subject.setText(addClickablePart(activity.getRichSubjectElement()),
                 activityViewHolder.subject.setText(addClickablePart(activity.getRichSubjectElement()),
                         TextView.BufferType.SPANNABLE);
                         TextView.BufferType.SPANNABLE);
                 activityViewHolder.subject.setVisibility(View.VISIBLE);
                 activityViewHolder.subject.setVisibility(View.VISIBLE);
+            } else if (!TextUtils.isEmpty(activity.getSubject())) {
+                activityViewHolder.subject.setVisibility(View.VISIBLE);
+                activityViewHolder.subject.setText(activity.getSubject());
             } else {
             } else {
                 activityViewHolder.subject.setVisibility(View.GONE);
                 activityViewHolder.subject.setVisibility(View.GONE);
             }
             }