diff --git a/res/layout/profile_document_item.xml b/res/layout/profile_document_item.xml
index 37ccdc695..dc055481f 100644
--- a/res/layout/profile_document_item.xml
+++ b/res/layout/profile_document_item.xml
@@ -27,6 +27,17 @@
android:layout_weight="1"
android:visibility="gone"/>
+
+
-
\ No newline at end of file
+
diff --git a/res/layout/webxdc_compact_view.xml b/res/layout/webxdc_compact_view.xml
new file mode 100644
index 000000000..a1357eae4
--- /dev/null
+++ b/res/layout/webxdc_compact_view.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 37c3ec36e..daff34e98 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -253,4 +253,8 @@
+
+
+
+
diff --git a/src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java b/src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
index 80b0d59d8..8341d5c16 100644
--- a/src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
+++ b/src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
@@ -12,6 +12,7 @@ import com.codewaves.stickyheadergrid.StickyHeaderGridAdapter;
import org.thoughtcrime.securesms.components.AudioView;
import org.thoughtcrime.securesms.components.DocumentView;
+import org.thoughtcrime.securesms.components.WebxdcView;
import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader.BucketedThreadMedia;
import org.thoughtcrime.securesms.mms.AudioSlide;
import org.thoughtcrime.securesms.mms.DocumentSlide;
@@ -39,12 +40,14 @@ class ProfileDocumentsAdapter extends StickyHeaderGridAdapter {
private static class ViewHolder extends StickyHeaderGridAdapter.ItemViewHolder {
private final DocumentView documentView;
private final AudioView audioView;
+ private final WebxdcView webxdcView;
private final TextView date;
public ViewHolder(View v) {
super(v);
documentView = v.findViewById(R.id.document_view);
audioView = v.findViewById(R.id.audio_view);
+ webxdcView = v.findViewById(R.id.webxdc_view);
date = v.findViewById(R.id.date);
}
}
@@ -97,6 +100,7 @@ class ProfileDocumentsAdapter extends StickyHeaderGridAdapter {
if (slide != null && slide.hasAudio()) {
viewHolder.documentView.setVisibility(View.GONE);
+ viewHolder.webxdcView.setVisibility(View.GONE);
viewHolder.audioView.setVisibility(View.VISIBLE);
viewHolder.audioView.setAudio((AudioSlide)slide, dcMsg.getDuration());
@@ -107,8 +111,19 @@ class ProfileDocumentsAdapter extends StickyHeaderGridAdapter {
viewHolder.audioView.setLongClickable(selected.isEmpty());
viewHolder.itemView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg));
}
+ else if (slide != null && slide.isWebxdcDocument()) {
+ viewHolder.audioView.setVisibility(View.GONE);
+ viewHolder.documentView.setVisibility(View.GONE);
+
+ viewHolder.webxdcView.setVisibility(View.VISIBLE);
+ viewHolder.webxdcView.setWebxdc(dcMsg, "Webxdc");
+ viewHolder.webxdcView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg));
+ viewHolder.webxdcView.setOnLongClickListener(view -> { itemClickListener.onMediaLongClicked(dcMsg); return true; });
+ viewHolder.itemView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg));
+ }
else if (slide != null && slide.hasDocument()) {
viewHolder.audioView.setVisibility(View.GONE);
+ viewHolder.webxdcView.setVisibility(View.GONE);
viewHolder.documentView.setVisibility(View.VISIBLE);
viewHolder.documentView.setDocument((DocumentSlide)slide);
@@ -119,6 +134,7 @@ class ProfileDocumentsAdapter extends StickyHeaderGridAdapter {
else {
viewHolder.documentView.setVisibility(View.GONE);
viewHolder.audioView.setVisibility(View.GONE);
+ viewHolder.webxdcView.setVisibility(View.GONE);
}
viewHolder.itemView.setOnLongClickListener(view -> { itemClickListener.onMediaLongClicked(dcMsg); return true; });
diff --git a/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java b/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java
index 0ad7cc88f..bfcdea7a3 100644
--- a/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java
+++ b/src/org/thoughtcrime/securesms/ProfileDocumentsFragment.java
@@ -153,7 +153,11 @@ public class ProfileDocumentsFragment
return;
}
- DcHelper.openForViewOrShare(getActivity(), dcMsg.getId(), Intent.ACTION_VIEW);
+ if (dcMsg.getType() == DcMsg.DC_MSG_WEBXDC) {
+ WebxdcActivity.openWebxdcActivity(context, dcMsg);
+ } else {
+ DcHelper.openForViewOrShare(getActivity(), dcMsg.getId(), Intent.ACTION_VIEW);
+ }
}
@Override
diff --git a/src/org/thoughtcrime/securesms/components/WebxdcView.java b/src/org/thoughtcrime/securesms/components/WebxdcView.java
index 6020d7876..7e4ae380b 100644
--- a/src/org/thoughtcrime/securesms/components/WebxdcView.java
+++ b/src/org/thoughtcrime/securesms/components/WebxdcView.java
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.components;
import android.content.Context;
+import android.content.res.TypedArray;
import androidx.annotation.AttrRes;
import androidx.annotation.NonNull;
@@ -44,7 +45,14 @@ public class WebxdcView extends FrameLayout {
public WebxdcView(@NonNull Context context, @Nullable AttributeSet attrs, @AttrRes int defStyleAttr) {
super(context, attrs, defStyleAttr);
- inflate(context, R.layout.webxdc_view, this);
+
+ TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.WebxdcView, 0, 0);
+ boolean compact = a.getBoolean(R.styleable.WebxdcView_compact, false);
+ if (compact) {
+ inflate(context, R.layout.webxdc_compact_view, this);
+ } else {
+ inflate(context, R.layout.webxdc_view, this);
+ }
this.icon = findViewById(R.id.webxdc_icon);
this.appName = findViewById(R.id.webxdc_app_name);