Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "use WeakReference to cache GameListItems and to inval them"

Browse source 
(Reusing Views this way seems to cause the occasional failure to recognize a tap-on-item bug.)

This reverts commit edd712ac16.
This commit is contained in:
Eric House 2012-12-28 10:06:16 -08:00
parent edd712ac16
commit 21e572acfc
2 changed files with 25 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java
View file

@ -193,9 +193,9 @@ public class GameListAdapter implements ExpandableListAdapter {
private View getChildView( int groupPosition, int childPosition )
{
long rowid = getRowIDFor( groupPosition, childPosition );
GameListItem result =
GameListItem.makeForRowID( m_context, rowid, m_handler,
groupPosition, m_fieldID, m_cb );
GameListItem result = (GameListItem)
m_factory.inflate( R.layout.game_list_item, null );
result.init( m_handler, rowid, groupPosition, m_fieldID, m_cb );
return result;
}

77
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListItem.java
View file

@ -24,16 +24,15 @@ import android.content.Context;
import android.graphics.Canvas;
import android.os.AsyncTask;
import android.os.Handler;
// import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import java.lang.ref.WeakReference;
import java.text.DateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
// import java.util.Iterator;
@ -43,9 +42,7 @@ import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
public class GameListItem extends LinearLayout
implements View.OnClickListener {
// private static HashSet<Long> s_invalRows = new HashSet<Long>();
private static HashMap<Long, WeakReference<GameListItem>> s_itemsCache =
new HashMap<Long, WeakReference<GameListItem>>();
private static HashSet<Long> s_invalRows = new HashSet<Long>();
private Context m_context;
private boolean m_loaded;
@ -72,10 +69,11 @@ public class GameListItem extends LinearLayout
m_loadingCount = 0;
}
private void init( Handler handler, int groupPosition,
int fieldID, GameListAdapter.LoadItemCB cb )
public void init( Handler handler, long rowid, int groupPosition,
int fieldID, GameListAdapter.LoadItemCB cb )
{
m_handler = handler;
m_rowid = rowid;
m_groupPosition = groupPosition;
m_fieldID = fieldID;
m_cb = cb;
@ -100,18 +98,18 @@ public class GameListItem extends LinearLayout
setName();
}
// @Override
// protected void onDraw( Canvas canvas )
// {
// super.onDraw( canvas );
// if ( DBUtils.ROWID_NOTFOUND != m_rowid ) {
// synchronized( s_invalRows ) {
// if ( s_invalRows.contains( m_rowid ) ) {
// forceReload();
// }
// }
// }
// }
@Override
protected void onDraw( Canvas canvas )
{
super.onDraw( canvas );
if ( DBUtils.ROWID_NOTFOUND != m_rowid ) {
synchronized( s_invalRows ) {
if ( s_invalRows.contains( m_rowid ) ) {
forceReload();
}
}
}
}
private void update( boolean expanded, long lastMoveTime, boolean haveTurn,
boolean haveTurnLocal )
@ -132,11 +130,6 @@ public class GameListItem extends LinearLayout
return m_rowid;
}
private void setRowID( long rowid )
{
m_rowid = rowid;
}
public int getGroupPosition()
{
return m_groupPosition;
@ -301,9 +294,9 @@ public class GameListItem extends LinearLayout
m_summary = summary;
setData( summary );
setLoaded( null != m_summary );
// synchronized( s_invalRows ) {
// s_invalRows.remove( m_rowid );
// }
synchronized( s_invalRows ) {
s_invalRows.remove( m_rowid );
}
}
// DbgUtils.logf( "LoadItemTask for row %d finished; "
// + "inval rows now %s",
@ -313,39 +306,13 @@ public class GameListItem extends LinearLayout
public static void inval( long rowid )
{
// synchronized( s_invalRows ) {
// s_invalRows.add( rowid );
// }
synchronized( s_itemsCache ) {
s_itemsCache.remove( rowid );
synchronized( s_invalRows ) {
s_invalRows.add( rowid );
}
// DbgUtils.logf( "GameListItem.inval(rowid=%d); inval rows now %s",
// rowid, invalRowsToString() );
}
public static GameListItem makeForRowID( Context context, long rowid,
Handler handler, int groupPosition,
int fieldID,
GameListAdapter.LoadItemCB cb )
{
GameListItem result = null;
synchronized( s_itemsCache ) {
WeakReference<GameListItem> ref = s_itemsCache.get( rowid );
if ( null != ref ) {
result = ref.get();
}
if ( null == result ) {
result = (GameListItem)
Utils.inflate( context, R.layout.game_list_item );
result.init( handler, groupPosition, fieldID, cb );
ref = new WeakReference<GameListItem>(result);
s_itemsCache.put( rowid, ref );
result.setRowID( rowid );
}
}
return result;
}
// private static String invalRowsToString()
// {
// String[] strs;