Intent works with folders and files (WIP)

Author: fesave

owncloudApp/src/main/AndroidManifest.xml

@@ -97,6 +97,11 @@
                     android:host="@string/url_link_host"
                     android:pathPrefix="/f/"
                     android:scheme="https" />
+
+                <data
+                    android:host="@string/url_link_host"
+                    android:pathPrefix="/f/"
+                    android:scheme="http" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.activity.ManageAccountsActivity" />

owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.kt

@@ -1113,6 +1113,7 @@ class FileDataStorageManager {
             isDownloading = it.getIntFromColumnOrThrow(FILE_IS_DOWNLOADING) == 1
             etagInConflict = it.getStringFromColumnOrThrow(FILE_ETAG_IN_CONFLICT)
             privateLink = it.getStringFromColumnOrThrow(FILE_PRIVATE_LINK)
+            owner = it.getStringFromColumnOrThrow(FILE_ACCOUNT_OWNER)
         }
     }
 

owncloudApp/src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -116,6 +116,7 @@ public static AvailableOfflineStatus fromValue(int value) {
     private boolean mSharedByLink;
     private boolean mSharedWithSharee;
     private String mPrivateLink;
+    private String mOwner;
 
     /**
      * URI to the local path of the file contents, if stored in the device; cached after first call
@@ -125,15 +126,15 @@ public static AvailableOfflineStatus fromValue(int value) {
 
     /**
      * Exportable URI to the local path of the file contents, if stored in the device.
-     *
+     * <p>
      * Cached after first call, until changed.
      */
     private Uri mExposedFileUri;
     public static final String PRIVATE_LINK_PATH = "/index.php/f/";
 
     /**
      * Create new {@link OCFile} with given path.
-     *
+     * <p>
      * The path received must be URL-decoded. Path separator must be File.separator, and it must be the first
      * character in 'path'.
      *
@@ -179,6 +180,7 @@ private OCFile(Parcel source) {
         mEtagInConflict = source.readString();
         mSharedWithSharee = source.readInt() == 1;
         mPrivateLink = source.readString();
+        mOwner = source.readString();
 
     }
 
@@ -206,6 +208,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(mEtagInConflict);
         dest.writeInt(mSharedWithSharee ? 1 : 0);
         dest.writeString(mPrivateLink);
+        dest.writeString(mOwner);
     }
 
     /**
@@ -352,7 +355,7 @@ public long getModificationTimestamp() {
 
     /**
      * Set a UNIX timestamp of the time the time the file was modified.
-     *
+     * <p>
      * To update with the value returned by the server in every synchronization of the properties
      * of this file.
      *
@@ -374,7 +377,7 @@ public long getModificationTimestampAtLastSyncForData() {
 
     /**
      * Set a UNIX timestamp of the time the time the file was modified.
-     *
+     * <p>
      * To update with the value returned by the server in every synchronization of THE CONTENTS
      * of this file.
      *
@@ -396,7 +399,7 @@ public String getFileName() {
 
     /**
      * Sets the name of the file
-     *
+     * <p>
      * Does nothing if the new name is null, empty or includes "/" ; or if the file is the root
      * directory
      */
@@ -507,6 +510,7 @@ public long getParentId() {
 
     /**
      * get remote path of parent file
+     *
      * @return remote path
      */
     public String getParentRemotePath() {
@@ -547,7 +551,7 @@ public AvailableOfflineStatus getAvailableOfflineStatus() {
     }
 
     /**
-     * @return      'True' when
+     * @return 'True' when
      */
     public boolean isAvailableOffline() {
         return (mAvailableOfflineStatus != AvailableOfflineStatus.NOT_AVAILABLE_OFFLINE);
@@ -651,8 +655,8 @@ public boolean isText() {
     }
 
     /**
-     * @param   type        Type to match in the file MIME type; it's MUST include the trailing "/"
-     * @return              'True' if the file MIME type matches the received parameter in the type part.
+     * @param type Type to match in the file MIME type; it's MUST include the trailing "/"
+     * @return 'True' if the file MIME type matches the received parameter in the type part.
      */
     private boolean isOfType(String type) {
         return (
@@ -750,4 +754,12 @@ public void copyLocalPropertiesFrom(OCFile sourceFile) {
         setTreeEtag(sourceFile.getTreeEtag());
         setEtagInConflict(sourceFile.getEtagInConflict());
     }
+
+    public String getOwner() {
+        return mOwner;
+    }
+
+    public void setOwner(String owner) {
+        mOwner = (owner == null) ? "" : owner;
+    }
 }

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -223,13 +223,13 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn
     override fun onPostCreate(savedInstanceState: Bundle?) {
         super.onPostCreate(savedInstanceState)
 
-        val dataIntent: Uri? = intent.data
-        manageDataIntent(dataIntent)
-
         if (savedInstanceState == null) {
             createMinFragments()
         }
 
+        val dataIntent: Uri? = intent.data
+        manageDataIntent(dataIntent)
+
         setBackgroundText()
     }
 
@@ -299,7 +299,7 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn
     private fun initFragmentsWithFile() {
         if (account != null && file != null) {
             /// First fragment
-            listOfFilesFragment?.listDirectory(currentDir)
+            listOfFilesFragment?.listDirectory(file)
                 ?: Timber.e("Still have a chance to lose the initialization of list fragment >(")
 
             /// Second fragment
@@ -420,7 +420,12 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn
 
     fun refreshListOfFilesFragment(reloadData: Boolean) {
         val fileListFragment = listOfFilesFragment
-        fileListFragment?.listDirectory(reloadData)
+        if (intent.data == null) {
+            fileListFragment?.listDirectory(reloadData)
+        } else {
+            fileListFragment?.listDirectory(isFileDiscovered(intent.data))
+        }
+
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -1658,6 +1663,7 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn
         } else if (uri != null) {
             isFileDiscovered(uri).let { OCFile ->
                 if (OCFile != null) {
+                    openFile(OCFile)
                 } else {
                     showMessageInToast(getString(R.string.no_file_found))
                 }
@@ -1667,6 +1673,12 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn
 
     private fun isFileDiscovered(uri: Uri?): OCFile? = storageManager.getFileByPrivateLink(uri.toString())
 
+    private fun openFile(file: OCFile) {
+        setFile(file)
+        setAccount(AccountUtils.getOwnCloudAccountByName(this, file.owner))
+        initFragmentsWithFile()
+    }
+
     companion object {
         private const val TAG_LIST_OF_FILES = "LIST_OF_FILES"
         private const val TAG_SECOND_FRAGMENT = "SECOND_FRAGMENT"