narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

added debug info + possible platform bug work arounds to message adapter

Browse source
This commit is contained in:
Daniel Gultsch 2015-01-05 18:46:42 +01:00
parent 0c51245ff5
commit fdcbdfdc05
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -10,6 +10,7 @@ import android.text.SpannableString;
import android.text.style.ForegroundColorSpan; import android.text.style.ForegroundColorSpan;
import android.text.style.StyleSpan; import android.text.style.StyleSpan;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener; import android.view.View.OnLongClickListener;
@ -23,6 +24,7 @@ import android.widget.Toast;
import java.util.List; import java.util.List;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.entities.Contact;
@ -430,6 +432,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
} }
return view; return view;
} else if (type == NULL) { } else if (type == NULL) {
if (viewHolder.message_box != null) {
Log.e(Config.LOGTAG, "detected type=NULL but with wrong cached view");
view = activity.getLayoutInflater().inflate(R.layout.message_null, parent, false);
view.setTag(new ViewHolder());
}
if (position == getCount() - 1) { if (position == getCount() - 1) {
view.getLayoutParams().height = 1; view.getLayoutParams().height = 1;
} else { } else {
@ -438,6 +445,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
} }
view.setLayoutParams(view.getLayoutParams()); view.setLayoutParams(view.getLayoutParams());
return view; return view;
} else if (message.wasMergedIntoPrevious()) {
Log.e(Config.LOGTAG,"detected wasMergedIntoPrevious with wrong type");
return view;
} else if (viewHolder.messageBody == null || viewHolder.image == null) { } else if (viewHolder.messageBody == null || viewHolder.image == null) {
return view; //avoiding weird platform bugs return view; //avoiding weird platform bugs
} else if (type == RECEIVED) { } else if (type == RECEIVED) {