yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 12:00:17 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into ice-cream-sandwich

Browse source
This commit is contained in:
Nikolay Pultsin 2015-09-25 18:59:55 +01:00
commit c543f247ce
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -9,6 +9,7 @@
* Simple widgets
===== 2.5.10 (Sep ??, 2015) =====
* Second (external) SD card entry in the library (classic view)
* Option for displaying current reading progress as percentage (by Danie Roux, danieroux@github)
* Option for max number of TOC marks on progress indicator

14
third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/FileChooserActivity.java vendored
View file

@ -1527,16 +1527,24 @@ public class FileChooserActivity extends Activity {
break;
}
boolean hasData = false;
Intent intent = new Intent();
if(returnPath != null)
if (returnPath != null) {
intent.putExtra(_FolderPath, returnPath);
hasData = true;
}
if(files != null){
if (files != null) {
intent.putExtra(_Results, files);
}else{
hasData = true;
} else {
intent.putExtra(_Results, new ArrayList<IFile>());
}
if (!hasData) {
return;
}
// return flags for further use (in case the caller needs)
intent.putExtra(_FilterMode, mFileProvider.getFilterMode());
intent.putExtra(_SaveDialog, mIsSaveDialog);