Revert "Add copy/move/rename/remove/isChildDocument"

This reverts commit 04303b3.

This should have been made on a separate branch.

Author: Emilie Roberts

StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudProvider.java

@@ -17,16 +17,13 @@
 
 package com.example.android.storageprovider;
 
-import static android.os.Build.VERSION.SDK_INT;
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.TypedArray;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.graphics.Point;
-import android.os.Build;
 import android.os.CancellationSignal;
 import android.os.Handler;
 import android.os.ParcelFileDescriptor;
@@ -39,12 +36,10 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -100,7 +95,7 @@ public boolean onCreate() {
 
         mBaseDir = getContext().getFilesDir();
 
-        writeTestFilesToStorage();
+        writeDummyFilesToStorage();
 
         return true;
     }
@@ -132,18 +127,10 @@ public Cursor queryRoots(String[] projection) throws FileNotFoundException {
         // FLAG_SUPPORTS_CREATE means at least one directory under the root supports creating
         // documents.  FLAG_SUPPORTS_RECENTS means your application's most recently used
         // documents will show up in the "Recents" category.  FLAG_SUPPORTS_SEARCH allows users
-        // to search all documents the application shares. FLAG_SUPPORTS_IS_CHILD allows
-        // testing parent child relationships, available after SDK 21 (Lollipop).
-        if (SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_CREATE |
-                    Root.FLAG_SUPPORTS_RECENTS |
-                    Root.FLAG_SUPPORTS_SEARCH );
-        } else {
-            row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_CREATE |
-                    Root.FLAG_SUPPORTS_RECENTS |
-                    Root.FLAG_SUPPORTS_SEARCH |
-                    Root.FLAG_SUPPORTS_IS_CHILD);
-        }
+        // to search all documents the application shares.
+        row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_CREATE |
+                Root.FLAG_SUPPORTS_RECENTS |
+                Root.FLAG_SUPPORTS_SEARCH);
 
         // COLUMN_TITLE is the root title (e.g. what will be displayed to identify your provider).
         row.add(Root.COLUMN_TITLE, getContext().getString(R.string.app_name));
@@ -343,27 +330,6 @@ public void onClose(IOException e) {
     // END_INCLUDE(open_document)
 
 
-    public boolean isChildFile(File parentFile, File childFile){
-        File realFileParent = childFile.getParentFile();
-        return realFileParent == null || realFileParent.equals(parentFile);
-    }
-
-    // BEGIN_INCLUDE(is_child_document)
-    @Override
-    public boolean isChildDocument(String parentDocumentId, String documentId) {
-        Log.v(TAG, "isChildDocument");
-        try {
-            File parentFile = getFileForDocId(parentDocumentId);
-            File childFile = getFileForDocId(documentId);
-            return isChildFile(parentFile, childFile);
-        } catch (FileNotFoundException e) {
-            Log.e(TAG, "FileNotFound in isChildDocument: " + e.getMessage());
-            e.printStackTrace();
-        }
-        return false;
-    }
-    // END_INCLUDE(is_child_document)
-
     // BEGIN_INCLUDE(create_document)
     @Override
     public String createDocument(String documentId, String mimeType, String displayName)
@@ -373,18 +339,9 @@ public String createDocument(String documentId, String mimeType, String displayN
         File parent = getFileForDocId(documentId);
         File file = new File(parent.getPath(), displayName);
         try {
-            // Create the new File to copy into
-            boolean wasNewFileCreated = false;
-            if (file.createNewFile()) {
-                if (file.setWritable(true) && file.setReadable(true)) {
-                    wasNewFileCreated = true;
-                }
-            }
-
-            if (!wasNewFileCreated) {
-                throw new FileNotFoundException("Failed to create document with name " +
-                        displayName +" and documentId " + documentId);
-            }
+            file.createNewFile();
+            file.setWritable(true);
+            file.setReadable(true);
         } catch (IOException e) {
             throw new FileNotFoundException("Failed to create document with name " +
                     displayName +" and documentId " + documentId);
@@ -393,38 +350,6 @@ public String createDocument(String documentId, String mimeType, String displayN
     }
     // END_INCLUDE(create_document)
 
-    // BEGIN_INCLUDE(rename_document)
-    @Override
-    public String renameDocument(String documentId, String displayName)
-            throws FileNotFoundException {
-        Log.v(TAG, "renameDocument");
-        if (displayName == null) {
-            throw new FileNotFoundException("Failed to rename document, new name is null");
-        }
-
-        // Create the destination file in the same directory as the source file
-        File sourceFile = getFileForDocId(documentId);
-        File sourceParentFile = sourceFile.getParentFile();
-        if (sourceParentFile == null) {
-            throw new FileNotFoundException("Failed to rename document. File has no parent.");
-        }
-        File destFile = new File(sourceParentFile.getPath(), displayName);
-
-        // Try to do the rename
-        try {
-            boolean renameSucceeded = sourceFile.renameTo(destFile);
-            if (!renameSucceeded) {
-                throw new FileNotFoundException("Failed to rename document. Renamed failed.");
-            }
-        } catch (Exception e) {
-            Log.w(TAG, "Rename exception : " + e.getLocalizedMessage() + e.getCause());
-            throw new FileNotFoundException("Failed to rename document. Error: " + e.getMessage());
-        }
-
-        return getDocIdForFile(destFile);
-    }
-    // END_INCLUDE(rename_document)
-
     // BEGIN_INCLUDE(delete_document)
     @Override
     public void deleteDocument(String documentId) throws FileNotFoundException {
@@ -438,113 +363,6 @@ public void deleteDocument(String documentId) throws FileNotFoundException {
     }
     // END_INCLUDE(delete_document)
 
-    // BEGIN_INCLUDE(remove_document)
-    @Override
-    public void removeDocument(String documentId, String parentDocumentId)
-            throws FileNotFoundException {
-        Log.v(TAG, "removeDocument");
-        File parent = getFileForDocId(parentDocumentId);
-        File file = getFileForDocId(documentId);
-
-        if (file == null) {
-            throw new FileNotFoundException("Failed to delete document with id " + documentId);
-        }
-
-        // removeDocument is the same as deleteDocument but allows the parent to be specified
-        // Check here if the specified parentDocumentId matches the true parent of documentId
-        boolean doesFileParentMatch = false;
-        File fileParent = file.getParentFile();
-
-        if (fileParent == null || fileParent.equals(parent)) {
-            doesFileParentMatch = true;
-        }
-
-        // Remove the file if parent matches or file and parent are equal
-        if (parent.equals(file) || doesFileParentMatch) {
-            if (file.delete()) {
-                Log.i(TAG, "Deleted file with id " + documentId);
-            } else {
-                throw new FileNotFoundException("Failed to delete document with id " + documentId);
-            }
-        } else {
-            throw new FileNotFoundException("Failed to delete document with id " + documentId);
-        }
-    }
-    // END_INCLUDE(remove_document)
-
-    /**
-     * overload copyDocument to insist that the parent matches
-     */
-    public String copyDocument(String sourceDocumentId, String sourceParentDocumentId,
-                               String targetParentDocumentId) throws FileNotFoundException {
-        Log.v(TAG, "copyDocument with document parent");
-        if (!isChildDocument(sourceParentDocumentId, sourceDocumentId)) {
-            throw new FileNotFoundException("Failed to copy document with id " +
-                    sourceDocumentId + ". Parent is not: " + sourceParentDocumentId);
-        }
-        return copyDocument(sourceDocumentId, targetParentDocumentId);
-    }
-
-    // BEGIN_INCLUDE(copyDocument)
-    @Override
-    public String copyDocument(String sourceDocumentId, String targetParentDocumentId)
-            throws FileNotFoundException {
-        Log.v(TAG, "copyDocument");
-
-        File parent = getFileForDocId(targetParentDocumentId);
-        File oldFile = getFileForDocId(sourceDocumentId);
-        File newFile = new File(parent.getPath(), oldFile.getName());
-        try {
-            // Create the new File to copy into
-            boolean wasNewFileCreated = false;
-            if (newFile.createNewFile()) {
-                if (newFile.setWritable(true) && newFile.setReadable(true)) {
-                    wasNewFileCreated = true;
-                }
-            }
-
-            if (!wasNewFileCreated) {
-                throw new FileNotFoundException("Failed to copy document " + sourceDocumentId +
-                        ". Could not create new file.");
-            }
-
-            // Copy the bytes into the new file
-            try (InputStream inStream = new FileInputStream(oldFile)) {
-                try (OutputStream outStream = new FileOutputStream(newFile)) {
-                    // Transfer bytes from in to out
-                    byte[] buf = new byte[4096]; // ideal range for network: 2-8k, disk: 8-64k
-                    int len;
-                    while ((len = inStream.read(buf)) > 0) {
-                        outStream.write(buf, 0, len);
-                    }
-                }
-            }
-        } catch (IOException e) {
-            throw new FileNotFoundException("Failed to copy document: " + sourceDocumentId +
-                    ". " + e.getMessage());
-        }
-        return getDocIdForFile(newFile);
-    }
-    // END_INCLUDE(copyDocument)
-
-    // BEGIN_INCLUDE(moveDocument)
-    @Override
-    public String moveDocument(String sourceDocumentId, String sourceParentDocumentId,
-                               String targetParentDocumentId) throws FileNotFoundException {
-        Log.v(TAG, "moveDocument");
-        try {
-            // Copy document, insisting that the parent is correct
-            String newDocumentId = copyDocument(sourceDocumentId, sourceParentDocumentId,
-                    targetParentDocumentId);
-            // Remove old document
-            removeDocument(sourceDocumentId,sourceParentDocumentId);
-            return newDocumentId;
-        } catch (FileNotFoundException e) {
-            throw new FileNotFoundException("Failed to move document " + sourceDocumentId);
-        }
-    }
-    // END_INCLUDE(moveDocument)
-
 
     @Override
     public String getDocumentType(String documentId) throws FileNotFoundException {
@@ -653,7 +471,7 @@ private String getDocIdForFile(File file) {
      * @param result the cursor to modify
      * @param docId  the document ID representing the desired file (may be null if given file)
      * @param file   the File object representing the desired file (may be null if given docID)
-     * @throws FileNotFoundException
+     * @throws java.io.FileNotFoundException
      */
     private void includeFile(MatrixCursor result, String docId, File file)
             throws FileNotFoundException {
@@ -679,16 +497,6 @@ private void includeFile(MatrixCursor result, String docId, File file)
             // FLAG_SUPPORTS_DELETE
             flags |= Document.FLAG_SUPPORTS_WRITE;
             flags |= Document.FLAG_SUPPORTS_DELETE;
-
-            // Add SDK specific flags if appropriate
-            if (SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                flags |= Document.FLAG_SUPPORTS_RENAME;
-            }
-            if (SDK_INT >= Build.VERSION_CODES.N) {
-                flags |= Document.FLAG_SUPPORTS_REMOVE;
-                flags |= Document.FLAG_SUPPORTS_MOVE;
-                flags |= Document.FLAG_SUPPORTS_COPY;
-            }
         }
 
         final String displayName = file.getName();
@@ -736,12 +544,13 @@ private File getFileForDocId(String docId) throws FileNotFoundException {
         }
     }
 
+
     /**
      * Preload sample files packaged in the apk into the internal storage directory.  This is a
-     * test function specific to this demo.  The MyCloud mock cloud service doesn't actually
+     * dummy function specific to this demo.  The MyCloud mock cloud service doesn't actually
      * have a backend, so it simulates by reading content from the device's internal storage.
      */
-    private void writeTestFilesToStorage() {
+    private void writeDummyFilesToStorage() {
         if (mBaseDir.list().length > 0) {
             return;
         }
@@ -763,7 +572,7 @@ private void writeTestFilesToStorage() {
     }
 
     /**
-     * Write a file to internal storage.  Used to set up our simple "cloud server".
+     * Write a file to internal storage.  Used to set up our dummy "cloud server".
      *
      * @param resId     the resource ID of the file to write to internal storage
      * @param extension the file extension (ex. .png, .mp3)
@@ -801,12 +610,14 @@ private int[] getResourceIdArray(int arrayResId) {
     }
 
     /**
-     * Placeholder function to determine whether the user is logged in.
+     * Dummy function to determine whether the user is logged in.
      */
     private boolean isUserLoggedIn() {
         final SharedPreferences sharedPreferences =
                 getContext().getSharedPreferences(getContext().getString(R.string.app_name),
                         Context.MODE_PRIVATE);
         return sharedPreferences.getBoolean(getContext().getString(R.string.key_logged_in), false);
     }
+
+
 }