Fix issue #268
This commit is contained in:
parent
f181fc353d
commit
80ca8bf2f0
|
@ -1586,13 +1586,14 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
//Click on a conversation
|
//Click on a conversation
|
||||||
|
|
||||||
if ((getItemViewType(viewHolder.getAdapterPosition()) == DISPLAYED_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == COMPACT_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == CONSOLE_STATUS)) {
|
if ((getItemViewType(viewHolder.getAdapterPosition()) == DISPLAYED_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == COMPACT_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == CONSOLE_STATUS)) {
|
||||||
|
|
||||||
holder.status_spoiler.setOnClickListener(new View.OnClickListener() {
|
holder.status_spoiler.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
if (type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE && type != RetrieveFeedsAsyncTask.Type.NEWS) {
|
if (type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE && type != RetrieveFeedsAsyncTask.Type.NEWS) {
|
||||||
Intent intent = new Intent(context, ShowConversationActivity.class);
|
Intent intent = new Intent(context, ShowConversationActivity.class);
|
||||||
int position = closePanels();
|
int position = closePanels();
|
||||||
if( holder.getAdapterPosition() == position)
|
if( holder.getAdapterPosition() == position && type == RetrieveFeedsAsyncTask.Type.CONTEXT)
|
||||||
return;
|
return;
|
||||||
Bundle b = new Bundle();
|
Bundle b = new Bundle();
|
||||||
if( social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA)
|
if( social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA)
|
||||||
|
@ -1617,7 +1618,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
if (type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE && type != RetrieveFeedsAsyncTask.Type.NEWS) {
|
if (type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE && type != RetrieveFeedsAsyncTask.Type.NEWS) {
|
||||||
Intent intent = new Intent(context, ShowConversationActivity.class);
|
Intent intent = new Intent(context, ShowConversationActivity.class);
|
||||||
int position = closePanels();
|
int position = closePanels();
|
||||||
if( holder.getAdapterPosition() == position)
|
if( holder.getAdapterPosition() == position && type == RetrieveFeedsAsyncTask.Type.CONTEXT)
|
||||||
return;
|
return;
|
||||||
Bundle b = new Bundle();
|
Bundle b = new Bundle();
|
||||||
if( social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA)
|
if( social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA)
|
||||||
|
@ -1642,7 +1643,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
if (type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE && type != RetrieveFeedsAsyncTask.Type.NEWS) {
|
if (type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE && type != RetrieveFeedsAsyncTask.Type.NEWS) {
|
||||||
Intent intent = new Intent(context, ShowConversationActivity.class);
|
Intent intent = new Intent(context, ShowConversationActivity.class);
|
||||||
int position = closePanels();
|
int position = closePanels();
|
||||||
if( holder.getAdapterPosition() == position)
|
if( holder.getAdapterPosition() == position && type == RetrieveFeedsAsyncTask.Type.CONTEXT)
|
||||||
return;
|
return;
|
||||||
Bundle b = new Bundle();
|
Bundle b = new Bundle();
|
||||||
if( social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA)
|
if( social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA)
|
||||||
|
|
Loading…
Reference in New Issue