Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

get permission before downloading

Browse source 
Trying to download an update, and likely a wordlist, fails if STORAGE
permission isn't acquired first.
This commit is contained in:
Eric House 2016-12-31 15:56:24 -08:00
parent 503ea46ca5
commit 8c7e1646fa
1 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,6 +46,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.eehouse.android.xw4.Perms23.Perm;
public class DwnldDelegate extends ListDelegateBase {
private static final String TAG = DwnldDelegate.class.getSimpleName();
@ -106,10 +108,11 @@ public class DwnldDelegate extends ListDelegateBase {
item.findViewById( R.id.progress_bar );
}
public void setLabel( String text )
public DownloadFilesTask setLabel( String text )
{
TextView tv = (TextView)m_listItem.findViewById( R.id.dwnld_message );
tv.setText( text );
return this;
}
@Override
@ -287,21 +290,39 @@ public class DwnldDelegate extends ListDelegateBase {
if ( 0 == m_dfts.size() ) {
finish();
} else {
Assert.assertTrue( m_dfts.size() == uris.length );
mkListAdapter();
for ( int ii = 0; ii < uris.length; ++ii ) {
String showName = basename( uris[ii].getPath() );
showName = DictUtils.removeDictExtn( showName );
String msg =
getString( R.string.downloading_dict_fmt, showName );
dft = m_dfts.get( ii );
dft.setLabel( msg );
dft.execute();
}
final Uri[] fUris = uris;
new Perms23.Builder( Perm.STORAGE )
.asyncQuery( m_activity, new Perms23.PermCbck() {
@Override
public void onPermissionResult( Map<Perm,
Boolean> granted )
{
if ( granted.get(Perm.STORAGE) ) {
doWithPermissions( fUris );
} else {
finish();
}
}
} );
}
} // init
}
private void doWithPermissions( Uri[] uris )
{
Assert.assertTrue( m_dfts.size() == uris.length );
mkListAdapter();
for ( int ii = 0; ii < uris.length; ++ii ) {
String showName = basename( uris[ii].getPath() );
showName = DictUtils.removeDictExtn( showName );
String msg =
getString( R.string.downloading_dict_fmt, showName );
m_dfts.get( ii )
.setLabel( msg )
.execute();
}
} // doWithPermissions
@Override
protected boolean handleBackPressed()