スクリーンショットと読み込んだ写真が共有されない不具合を修正。

Author: masaru-takano

dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/java/org/deviceconnect/android/deviceplugin/theta/data/ThetaObjectStorage.java

@@ -28,7 +28,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -337,7 +336,7 @@ private ContentValues makeContentValue(final ThetaObject object) throws IOExcept
                         dataImage);
                 values.put(THETA_MAIN_URL, imagePath);
 
-                mMediaSharing.sharePhoto(mContext, new File(mFileManager.getBasePath(), imagePath));
+                mMediaSharing.sharePhoto(mContext, new File(imagePath));
             }
         }
         return values;
@@ -346,25 +345,22 @@ private ContentValues makeContentValue(final ThetaObject object) throws IOExcept
 
     // save theta's image
     @SuppressWarnings("deprecation")
-    private String saveThetaImage(final String cacheDir,
+    private String saveThetaImage(final String cacheDirName,
                                   final String originalFileName,
                                   final byte[] thetaImage) throws IOException {
-        String root = mFileManager.getBasePath().getAbsolutePath()
-                + "/" + cacheDir + "/";
-        File dir = new File(root);
-        if (!dir.exists()) {
-            if (!dir.mkdirs()) {
-                throw new IOException("Failed to create directory: path = " + dir.getAbsolutePath());
+        File cacheDir = new File(mFileManager.getBasePath(), cacheDirName);
+        if (!cacheDir.exists()) {
+            if (!cacheDir.mkdirs()) {
+                throw new IOException("Failed to create directory: path = " + cacheDir.getAbsolutePath());
             }
         }
 
         Date date = new Date();
         SimpleDateFormat fileDate = new SimpleDateFormat("yyyyMMdd_HHmmss");
         final String fileName =  originalFileName + "." + fileDate.format(date);
-        final String filePath = cacheDir + "/" + fileName;
 
-        mFileManager.saveFile(filePath, thetaImage);
-        return filePath;
+        mFileManager.saveFile(cacheDirName + "/" + fileName, thetaImage);
+        return new File(cacheDir, fileName).getAbsolutePath();
     }
 
     // load theta's image data.

dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/java/org/deviceconnect/android/deviceplugin/theta/fragment/ThetaVRModeFragment.java

@@ -7,13 +7,9 @@
 package org.deviceconnect.android.deviceplugin.theta.fragment;
 
 import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.ContentValues;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.net.Uri;
 import android.os.Bundle;
-import android.provider.MediaStore;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
@@ -28,7 +24,6 @@
 import androidx.collection.LruCache;
 import androidx.fragment.app.Fragment;
 
-import org.deviceconnect.android.deviceplugin.theta.BuildConfig;
 import org.deviceconnect.android.deviceplugin.theta.R;
 import org.deviceconnect.android.deviceplugin.theta.ThetaDeviceApplication;
 import org.deviceconnect.android.deviceplugin.theta.activity.ThetaDeviceSettingsActivity;
@@ -46,7 +41,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -338,8 +332,9 @@ private void init3DButtons(final View rootView) {
     /**
      * Save ScreenShot.
      */
+    @SuppressWarnings("deprecation")
     private void saveScreenShot() {
-        FileManager fileManager = new FileManager(getActivity());
+        final FileManager fileManager = new FileManager(getActivity());
         fileManager.checkWritePermission(new FileManager.CheckPermissionCallback() {
             @Override
             public void onSuccess() {
@@ -357,24 +352,21 @@ public void onSuccess() {
                     });
                     return;
                 }
-                String root = getContext().getExternalFilesDir(null).getPath() + "/screenshots/";
-                File dir = new File(root);
-                if (!dir.exists()) {
-                    dir.mkdir();
+
+                String cacheDirName = "screenshots";
+                File cacheDir = new File(fileManager.getBasePath(), cacheDirName);
+                if (!cacheDir.exists()) {
+                    cacheDir.mkdirs();
                 }
 
                 Date date = new Date();
                 SimpleDateFormat fileDate = new SimpleDateFormat("yyyyMMdd_HHmmss");
                 final String fileName = "theta_vr_screenshot_" + fileDate.format(date) + ".jpg";
-                final String filePath = root + fileName;
 
                 try {
-                    saveFile(filePath, mSphereView.takeSnapshot());
-                    if (BuildConfig.DEBUG) {
-                        mLogger.info("absolute path:" + filePath);
-                    }
+                    fileManager.saveFile(cacheDirName + "/" + fileName, mSphereView.takeSnapshot());
 
-                    mMediaSharing.sharePhoto(getContext(), new File(filePath));
+                    mMediaSharing.sharePhoto(getContext(), new File(cacheDir, fileName));
 
                     if (activity != null) {
                         activity.runOnUiThread(() -> {
@@ -418,32 +410,6 @@ public void onFail() {
 
     }
 
-    /**
-     * Save File.
-     * @param filename absolute path
-     * @param data binary
-     * @throws IOException Failed Save
-     */
-    private void saveFile(final String filename, final byte[] data) throws IOException {
-        Uri u = Uri.parse("file://" + filename);
-        ContentResolver contentResolver = getActivity().getContentResolver();
-        OutputStream out = null;
-        try {
-            out = contentResolver.openOutputStream(u, "w");
-            out.write(data);
-            out.flush();
-        } catch (Exception e) {
-            throw new IOException("Failed to save a file." + filename);
-        } finally {
-            if (out != null) {
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
     /**
      * ScreenShot failed.
      */