Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-27 07:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove progress trackers as downloads come in

Browse source
This commit is contained in:
Eric House 2014-06-05 07:17:55 -07:00
parent b0912f3fa2
commit 202c942ab0
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java
View file

@ -43,6 +43,7 @@ import java.io.InputStream;
import java.net.URI; import java.net.URI;
import java.net.URLConnection; import java.net.URLConnection;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import junit.framework.Assert; import junit.framework.Assert;
@ -55,8 +56,7 @@ public class DwnldDelegate extends ListDelegateBase {
private ListActivity m_activity; private ListActivity m_activity;
private Handler m_handler; private Handler m_handler;
private LinearLayout[] m_views; private ArrayList<LinearLayout> m_views;
int m_pending = 0;
public interface DownloadFinishedListener { public interface DownloadFinishedListener {
void downloadFinished( String name, boolean success ); void downloadFinished( String name, boolean success );
@ -160,7 +160,10 @@ public class DwnldDelegate extends ListDelegateBase {
callListener( m_uri, false ); callListener( m_uri, false );
} }
if ( 0 == --m_pending ) { m_views.remove( m_listItem );
mkListAdapter();
if ( 0 == m_views.size() ) {
finish(); finish();
} }
} }
@ -178,10 +181,10 @@ public class DwnldDelegate extends ListDelegateBase {
} // class DownloadFilesTask } // class DownloadFilesTask
private class ImportListAdapter extends XWListAdapter { private class ImportListAdapter extends XWListAdapter {
public ImportListAdapter( int count) { super( count ); } public ImportListAdapter() { super( m_views.size() ); }
public View getView( int position, View convertView, ViewGroup parent ) public View getView( int position, View convertView, ViewGroup parent )
{ {
return m_views[position]; return m_views.get( position );
} }
} }
@ -210,12 +213,12 @@ public class DwnldDelegate extends ListDelegateBase {
} }
if ( null != urls ) { if ( null != urls ) {
dfts = new DownloadFilesTask[urls.length]; dfts = new DownloadFilesTask[urls.length];
m_views = new LinearLayout[urls.length]; m_views = new ArrayList<LinearLayout>();
for ( int ii = 0; ii < dfts.length; ++ii ) { for ( int ii = 0; ii < dfts.length; ++ii ) {
item = (LinearLayout)inflate( R.layout.import_dict_item ); item = (LinearLayout)inflate( R.layout.import_dict_item );
dfts[ii] = new DownloadFilesTask( Uri.parse( urls[ii] ), item, dfts[ii] = new DownloadFilesTask( Uri.parse( urls[ii] ), item,
isApp ); isApp );
m_views[ii] = item; m_views.add( item );
} }
} }
} else if ( (null != intent.getType() } else if ( (null != intent.getType()
@ -228,16 +231,15 @@ public class DwnldDelegate extends ListDelegateBase {
if ( null != dft ) { if ( null != dft ) {
Assert.assertNull( dfts ); Assert.assertNull( dfts );
dfts = new DownloadFilesTask[] { dft }; dfts = new DownloadFilesTask[] { dft };
m_views = new LinearLayout[] { item }; m_views = new ArrayList<LinearLayout>( 1 );
m_views.add( item );
dft = null; dft = null;
} }
if ( null == dfts ) { if ( null == dfts ) {
finish(); finish();
} else { } else {
m_pending = m_views.length; mkListAdapter();
setListAdapter( new ImportListAdapter( dfts.length ) );
for ( int ii = 0; ii < dfts.length; ++ii ) { for ( int ii = 0; ii < dfts.length; ++ii ) {
String showName = basename( Uri.parse( urls[ii] ).getPath() ); String showName = basename( Uri.parse( urls[ii] ).getPath() );
@ -250,6 +252,11 @@ public class DwnldDelegate extends ListDelegateBase {
} }
} // init } // init
private void mkListAdapter()
{
setListAdapter( new ImportListAdapter() );
}
private File saveToDownloads( InputStream is, String name, private File saveToDownloads( InputStream is, String name,
DictUtils.DownProgListener dpl ) DictUtils.DownProgListener dpl )
{ {