SonyのRAWファイル形式もついでに追加する。

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/playback/ImageGridViewFragment.java b/app/src/main/java/net/osdn/gokigen/pkremote/playback/ImageGridViewFragment.java
index b319cfd..04b3172 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/playback/ImageGridViewFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/playback/ImageGridViewFragment.java
@@ -62,6 +62,7 @@ public class ImageGridViewFragment extends Fragment implements AdapterView.OnIte
        private static final String OLYMPUS_RAW_SUFFIX = ".orf";
        private static final String PENTAX_RAW_PEF_SUFFIX = ".pef";
     private static final String PANASONIC_RAW_SUFFIX = ".rw2";
+    private static final String SONY_RAW_SUFFIX = ".arw";
 
 
     private MyContentDownloader contentDownloader;
@@ -459,6 +460,10 @@ public class ImageGridViewFragment extends Fragment implements AdapterView.OnIte
             {
                 contentItems.add(new CameraContentEx(item, true, PANASONIC_RAW_SUFFIX));
             }
+            else if (path.endsWith(SONY_RAW_SUFFIX))
+            {
+                contentItems.add(new CameraContentEx(item, true, SONY_RAW_SUFFIX));
+            }
         }
 
         for (CameraContentEx item : contentItems)

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 fc59870..be0420b 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
@@ -45,6 +45,7 @@ public class MyContentDownloader implements IDownloadContentCallback
     private static final String RAW_SUFFIX_2 = ".ORF";
     private static final String RAW_SUFFIX_3 = ".PEF";
     private static final String RAW_SUFFIX_4 = ".RW2";
+    private static final String RAW_SUFFIX_5 = ".ARW";
     private static final String MOVIE_SUFFIX = ".MOV";
     private static final String MOVIE_SUFFIX_MP4 = ".MP4";
     private static final String JPEG_SUFFIX = ".JPG";
@@ -110,6 +111,11 @@ public class MyContentDownloader implements IDownloadContentCallback
                 mimeType = "image/x-panasonic-raw2";
                 isSmallSize = false;
             }
+            else if (targetFileName.toUpperCase().contains(RAW_SUFFIX_5))
+            {
+                mimeType = "image/x-sony-arw";
+                isSmallSize = false;
+            }
             else if (targetFileName.toUpperCase().contains(MOVIE_SUFFIX))
             {
                 mimeType =  "video/mp4";