OlympusのRAWファイル転送時に拡張子がJPGになる不具合を改修する。

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/playback/MyContentDownloader.java b/app/src/main/java/net/osdn/gokigen/pkremote/playback/MyContentDownloader.java
index c793465..99bbd1f 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/playback/MyContentDownloader.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/playback/MyContentDownloader.java
@@ -83,7 +83,6 @@ public class MyContentDownloader implements IDownloadContentCallback
             Log.v(TAG, "startDownload() ICameraFileInfo is NULL...");
             return;
         }
-        Log.v(TAG, "startDownload() " + fileInfo.getOriginalName());
 
         // Download the image.
         try
@@ -93,7 +92,14 @@ public class MyContentDownloader implements IDownloadContentCallback
             if (replaceJpegSuffix != null)
             {
                 contentFileName = contentFileName.replace(JPEG_SUFFIX, replaceJpegSuffix);
+                targetFileName = contentFileName;
             }
+            else
+            {
+                targetFileName = fileInfo.getOriginalName().toUpperCase();
+            }
+            Log.v(TAG, "startDownload() " + targetFileName);
+
             if (contentFileName.toUpperCase().contains(RAW_SUFFIX_1))
             {
                 mimeType = "image/x-adobe-dng";
@@ -159,8 +165,6 @@ public class MyContentDownloader implements IDownloadContentCallback
                 mimeType = "image/jpeg";
             }
 
-            targetFileName = fileInfo.getOriginalName().toUpperCase();
-
             ////// ダイアログの表示
             activity.runOnUiThread(new Runnable() {
                 @Override