diff --git a/APK/FADownloader-rc-9-1.5-20170309_043049.apk b/APK/FADownloader-rc-9-1.5-20170309_043049.apk
new file mode 100644
index 0000000..3cb4067
Binary files /dev/null and b/APK/FADownloader-rc-9-1.5-20170309_043049.apk differ
diff --git a/app/src/main/java/jp/juggler/fadownloader/DownloadService.java b/app/src/main/java/jp/juggler/fadownloader/DownloadService.java
index bd186e6..5727a05 100644
--- a/app/src/main/java/jp/juggler/fadownloader/DownloadService.java
+++ b/app/src/main/java/jp/juggler/fadownloader/DownloadService.java
@@ -261,6 +261,8 @@ void worker_wakeup( String cause ){
}
@Override public void onThreadEnd( boolean allow_stop_service ){
+ if(!is_alive) return;
+
if( ! will_restart ){
if( allow_stop_service ){
allow_cancel_alarm = true;
diff --git a/app/src/main/java/jp/juggler/fadownloader/FolderPicker.java b/app/src/main/java/jp/juggler/fadownloader/FolderPicker.java
index b00532f..58c8926 100644
--- a/app/src/main/java/jp/juggler/fadownloader/FolderPicker.java
+++ b/app/src/main/java/jp/juggler/fadownloader/FolderPicker.java
@@ -220,7 +220,7 @@ private void openFolderCreateDialog(){
showToast( false, getString( R.string.folder_creation_failed ) );
}else{
d.dismiss();
- loadFolder( showing_folder );
+ loadFolder( folder );
}
}
}catch(Throwable ex){
diff --git a/app/src/main/java/jp/juggler/fadownloader/Page0.java b/app/src/main/java/jp/juggler/fadownloader/Page0.java
index d6ac02f..d2809eb 100644
--- a/app/src/main/java/jp/juggler/fadownloader/Page0.java
+++ b/app/src/main/java/jp/juggler/fadownloader/Page0.java
@@ -99,7 +99,11 @@ public Page0( Activity activity, View ignored ){
folder_pick();
break;
case R.id.btnFolderPickerHelp:
- ( (ActMain) activity ).openHelp( R.layout.help_local_folder );
+ if( Build.VERSION.SDK_INT >= LocalFile.DOCUMENT_FILE_VERSION){
+ ( (ActMain) activity ).openHelp( R.layout.help_local_folder );
+ }else{
+ ( (ActMain) activity ).openHelp( activity.getString( R.string.help_local_folder_kitkat ) );
+ }
break;
case R.id.btnFlashAirURLHelp:
( (ActMain) activity ).openHelp( activity.getString( R.string.help_flashair_url_text ) );
diff --git a/app/src/main/res/layout/folder_picker.xml b/app/src/main/res/layout/folder_picker.xml
index 9846ba0..da42c15 100644
--- a/app/src/main/res/layout/folder_picker.xml
+++ b/app/src/main/res/layout/folder_picker.xml
@@ -8,6 +8,14 @@