Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 21:29:54 +01:00
Code Issues Projects Releases Wiki Activity

Show paperclip icon for non-text messages.

Browse Source
This commit is contained in:
akwizgran
2014-02-08 18:21:21 +00:00
parent fc54bc2207
commit efa62f7619
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
View File

@@ -22,8 +22,8 @@ import android.text.format.DateUtils;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ImageButton;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
class ConversationAdapter extends ArrayAdapter<ConversationItem> { class ConversationAdapter extends ArrayAdapter<ConversationItem> {
@@ -64,7 +64,7 @@ class ConversationAdapter extends ArrayAdapter<ConversationItem> {
date.setText(DateUtils.formatSameDayTime(then, now, SHORT, SHORT)); date.setText(DateUtils.formatSameDayTime(then, now, SHORT, SHORT));
headerLayout.addView(date); headerLayout.addView(date);
if(!item.isExpanded()) return headerLayout; if(!item.isExpanded() || item.getBody() == null) return headerLayout;
LinearLayout expanded = new LinearLayout(ctx); LinearLayout expanded = new LinearLayout(ctx);
expanded.setOrientation(VERTICAL); expanded.setOrientation(VERTICAL);
@@ -72,18 +72,17 @@ class ConversationAdapter extends ArrayAdapter<ConversationItem> {
expanded.setBackgroundColor(background); expanded.setBackgroundColor(background);
expanded.addView(headerLayout); expanded.addView(headerLayout);
byte[] body = item.getBody(); if(header.getContentType().equals("text/plain")) {
if(body == null) {
ProgressBar progress = new ProgressBar(ctx);
progress.setPadding(pad, 0, pad, pad);
progress.setIndeterminate(true);
expanded.addView(progress);
} else if(header.getContentType().equals("text/plain")) {
TextView text = new TextView(ctx); TextView text = new TextView(ctx);
text.setPadding(pad, 0, pad, pad); text.setPadding(pad, 0, pad, pad);
text.setBackgroundColor(background); text.setBackgroundColor(background);
text.setText(StringUtils.fromUtf8(body)); text.setText(StringUtils.fromUtf8(item.getBody()));
expanded.addView(text); expanded.addView(text);
} else {
ImageButton attachment = new ImageButton(ctx);
attachment.setPadding(pad, 0, pad, pad);
attachment.setImageResource(R.drawable.content_attachment);
expanded.addView(attachment);
} }
return expanded; return expanded;

21
briar-android/src/org/briarproject/android/groups/GroupAdapter.java
View File

@@ -22,8 +22,8 @@ import android.text.format.DateUtils;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ImageButton;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
class GroupAdapter extends ArrayAdapter<GroupItem> { class GroupAdapter extends ArrayAdapter<GroupItem> {
@@ -66,7 +66,7 @@ class GroupAdapter extends ArrayAdapter<GroupItem> {
date.setText(DateUtils.formatSameDayTime(then, now, SHORT, SHORT)); date.setText(DateUtils.formatSameDayTime(then, now, SHORT, SHORT));
headerLayout.addView(date); headerLayout.addView(date);
if(!item.isExpanded()) return headerLayout; if(!item.isExpanded() || item.getBody() == null) return headerLayout;
LinearLayout expanded = new LinearLayout(ctx); LinearLayout expanded = new LinearLayout(ctx);
expanded.setOrientation(VERTICAL); expanded.setOrientation(VERTICAL);
@@ -74,20 +74,19 @@ class GroupAdapter extends ArrayAdapter<GroupItem> {
expanded.setBackgroundColor(background); expanded.setBackgroundColor(background);
expanded.addView(headerLayout); expanded.addView(headerLayout);
byte[] body = item.getBody(); if(header.getContentType().equals("text/plain")) {
if(body == null) {
ProgressBar progress = new ProgressBar(ctx);
progress.setPadding(pad, 0, pad, pad);
progress.setIndeterminate(true);
expanded.addView(progress);
} else if(header.getContentType().equals("text/plain")) {
TextView text = new TextView(ctx); TextView text = new TextView(ctx);
text.setPadding(pad, 0, pad, pad); text.setPadding(pad, 0, pad, pad);
text.setBackgroundColor(background); text.setBackgroundColor(background);
text.setText(StringUtils.fromUtf8(body)); text.setText(StringUtils.fromUtf8(item.getBody()));
expanded.addView(text); expanded.addView(text);
} else {
ImageButton attachment = new ImageButton(ctx);
attachment.setPadding(pad, 0, pad, pad);
attachment.setImageResource(R.drawable.content_attachment);
expanded.addView(attachment);
} }
return expanded; return expanded;
} }
} }