TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 15:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for intermittent crash

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-01-24 17:48:32 -08:00
parent 342fd37799
commit b575b4e6ae
4 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/ConversationAdapter.java
View File

@ -300,5 +300,10 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
Cursor cursor = getCursorAtPositionOrThrow(position); Cursor cursor = getCursorAtPositionOrThrow(position);
viewHolder.setText(DateUtils.getRelativeDate(getContext(), locale, getMessageRecord(cursor).getDateReceived())); viewHolder.setText(DateUtils.getRelativeDate(getContext(), locale, getMessageRecord(cursor).getDateReceived()));
} }
@Override
public boolean isActive() {
return isActiveCursor();
}
} }

5
src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
View File

@ -145,6 +145,11 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
return getHeaderString(position); return getHeaderString(position);
} }
@Override
public boolean isActive() {
return isActiveCursor();
}
public Map<Long, String> getSelectedContacts() { public Map<Long, String> getSelectedContacts() {
return selectedContacts; return selectedContacts;
} }

2
src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
View File

@ -183,7 +183,7 @@ public abstract class CursorRecyclerViewAdapter<VH extends RecyclerView.ViewHold
return cursor; return cursor;
} }
private boolean isActiveCursor() { protected boolean isActiveCursor() {
return valid && cursor != null; return valid && cursor != null;
} }

27
src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
View File

@ -7,6 +7,7 @@ import android.support.v4.view.ViewCompat;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.RecyclerView.ViewHolder; import android.support.v7.widget.RecyclerView.ViewHolder;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -19,6 +20,8 @@ import java.util.Map;
*/ */
public class StickyHeaderDecoration extends RecyclerView.ItemDecoration { public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
private static final String TAG = StickyHeaderDecoration.class.getName();
private final Map<Long, ViewHolder> headerCache; private final Map<Long, ViewHolder> headerCache;
private final StickyHeaderAdapter adapter; private final StickyHeaderAdapter adapter;
private final boolean renderInline; private final boolean renderInline;
@ -42,18 +45,22 @@ public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
int position = parent.getChildAdapterPosition(view); int position = parent.getChildAdapterPosition(view);
int headerHeight = 0; int headerHeight = 0;
if (position != RecyclerView.NO_POSITION && hasHeader(parent, position)) { if (position != RecyclerView.NO_POSITION && hasHeader(parent, adapter, position)) {
View header = getHeader(parent, position).itemView; View header = getHeader(parent, adapter, position).itemView;
headerHeight = getHeaderHeightForLayout(header); headerHeight = getHeaderHeightForLayout(header);
} }
outRect.set(0, headerHeight, 0, 0); outRect.set(0, headerHeight, 0, 0);
} }
private boolean hasHeader(RecyclerView parent, int adapterPos) { private boolean hasHeader(RecyclerView parent, StickyHeaderAdapter adapter, int adapterPos) {
boolean isReverse = isReverseLayout(parent); boolean isReverse = isReverseLayout(parent);
if (isReverse && adapterPos == parent.getAdapter().getItemCount() - 1 ||
!isReverse && adapterPos == 0) { if (!adapter.isActive()) {
return false;
}
if (isReverse && adapterPos == ((RecyclerView.Adapter)adapter).getItemCount() - 1 || !isReverse && adapterPos == 0) {
return true; return true;
} }
@ -61,7 +68,7 @@ public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
return adapter.getHeaderId(adapterPos) != adapter.getHeaderId(previous); return adapter.getHeaderId(adapterPos) != adapter.getHeaderId(previous);
} }
private ViewHolder getHeader(RecyclerView parent, int position) { private ViewHolder getHeader(RecyclerView parent, StickyHeaderAdapter adapter, int position) {
final long key = adapter.getHeaderId(position); final long key = adapter.getHeaderId(position);
if (headerCache.containsKey(key)) { if (headerCache.containsKey(key)) {
@ -102,8 +109,8 @@ public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
final int adapterPos = parent.getChildAdapterPosition(child); final int adapterPos = parent.getChildAdapterPosition(child);
if (adapterPos != RecyclerView.NO_POSITION && (layoutPos == 0 || hasHeader(parent, adapterPos))) { if (adapterPos != RecyclerView.NO_POSITION && ((layoutPos == 0 && adapter.isActive()) || hasHeader(parent, adapter, adapterPos))) {
View header = getHeader(parent, adapterPos).itemView; View header = getHeader(parent, adapter, adapterPos).itemView;
c.save(); c.save();
final int left = child.getLeft(); final int left = child.getLeft();
final int top = getHeaderTop(parent, child, header, adapterPos, layoutPos); final int top = getHeaderTop(parent, child, header, adapterPos, layoutPos);
@ -129,7 +136,7 @@ public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
long nextId = adapter.getHeaderId(adapterPosHere); long nextId = adapter.getHeaderId(adapterPosHere);
if (nextId != currentId) { if (nextId != currentId) {
final View next = parent.getChildAt(translatedChildPosition(parent, i)); final View next = parent.getChildAt(translatedChildPosition(parent, i));
final int offset = getChildY(parent, next) - (headerHeight + getHeader(parent, adapterPosHere).itemView.getHeight()); final int offset = getChildY(parent, next) - (headerHeight + getHeader(parent, adapter, adapterPosHere).itemView.getHeight());
if (offset < 0) { if (offset < 0) {
return offset; return offset;
} else { } else {
@ -197,5 +204,7 @@ public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
* @param position the header's item position * @param position the header's item position
*/ */
void onBindHeaderViewHolder(T viewHolder, int position); void onBindHeaderViewHolder(T viewHolder, int position);
boolean isActive();
} }
} }