フォルダ名にカンマが含まれる場合にも正しく処理できるようにした

tateisu · Mar 6, 2017 · 848f0bb · 848f0bb
1 parent 74daf7c
commit 848f0bb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/src/main/java/jp/juggler/fadownloader/DownloadWorker.java b/app/src/main/java/jp/juggler/fadownloader/DownloadWorker.java
@@ -455,9 +455,10 @@ private static DocumentFile bsearch( ArrayList<DocumentFile> local_files, String
 							int attr = Integer.parseInt( mAttr.group( 2 ), 10 );
 							int date = Integer.parseInt( mAttr.group( 3 ), 10 );
 							int time = Integer.parseInt( mAttr.group( 4 ), 10 );
-							int delm = line.indexOf( ',' );
-							String dir = line.substring( 0, delm );
-							String fname = line.substring( delm + 1, mAttr.start() );
+
+							// https://flashair-developers.com/ja/support/forum/#/discussion/3/%E3%82%AB%E3%83%B3%E3%83%9E%E5%8C%BA%E5%88%87%E3%82%8A
+							String dir = (item.air_path.equals( "/" )? "": item.air_path);
+							String fname = line.substring( dir.length() + 1, mAttr.start() );
 
 							if( ( attr & 2 ) != 0 ){
 								// skip hidden file