v1.5

tateisu · Mar 8, 2017 · ed2d2e9 · ed2d2e9
1 parent f3273e9
commit ed2d2e9
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 2 deletions.
diff --git a/APK/FADownloader-rc-9-1.5-20170309_043049.apk b/APK/FADownloader-rc-9-1.5-20170309_043049.apk
diff --git 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
@@ -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
@@ -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
@@ -8,6 +8,14 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:textSize="20dp"
+        android:textColor="@android:color/black"
         android:id="@+id/tvCurrentFolder"
         />
     <Button

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -126,4 +126,5 @@
     <string name="folder_name_empty">フォルダの名前を指定してください</string>
     <string name="network_unreachable">FlashAirに到達できません</string>
     <string name="wifi_not_good">Wi-Fiの状態が悪いようです</string>
+    <string name="help_local_folder_kitkat">Local Folder にはスマホ上の、画像をダウンロードして保存するフォルダを指定します\n\nAndroid 4.4.x の場合、このアプリからSDカードに書き込むことはできません。「Pictures」の下あたりにFADownloader用のフォルダを作成してください。\n</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -133,5 +133,6 @@
     <string name="folder_creation_failed">folder creation failed.</string>
     <string name="network_unreachable">unreachable to FlashAir.</string>
     <string name="wifi_not_good">Wi-Fi not good.</string>
+    <string name="help_local_folder_kitkat">Local Folder にはスマホ上の、画像をダウンロードして保存するフォルダを指定します\n\nAndroid 4.4.x の場合、このアプリからSDカードに書き込むことはできません。「Pictures」の下あたりにFADownloader用のフォルダを作成してください。\n</string>
 
 </resources>