Solve some rebase conflicts

owncloud · Aug 28, 2019 · 5328e6f · 5328e6f
1 parent b44591c
commit 5328e6f
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 14 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/owncloud-android-library b/owncloud-android-library
diff --git a/owncloudApp/src/main/AndroidManifest.xml b/owncloudApp/src/main/AndroidManifest.xml
@@ -72,6 +72,15 @@
         android:supportsPictureInPicture="false"
         android:theme="@style/Theme.ownCloud.Toolbar"
         tools:targetApi="n">
+        <activity
+            android:name=".ui.activity.FileDisplayActivity"
+            android:theme="@style/Theme.ownCloud.Toolbar.Drawer">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity android:name=".ui.activity.ManageAccountsActivity" />
         <activity
             android:name=".ui.activity.ReceiveExternalFilesActivity"

diff --git a/owncloudApp/src/main/java/com/owncloud/android/files/services/FileDownloader.java b/owncloudApp/src/main/java/com/owncloud/android/files/services/FileDownloader.java
@@ -57,6 +57,7 @@
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.operations.DownloadFileOperation;
 import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.errorhandling.ErrorMessageAdapter;
 import com.owncloud.android.ui.notifications.NotificationUtils;
 import com.owncloud.android.ui.preview.PreviewImageActivity;

diff --git a/owncloudApp/src/main/java/com/owncloud/android/media/MediaService.java b/owncloudApp/src/main/java/com/owncloud/android/media/MediaService.java
@@ -47,6 +47,7 @@
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...pp/src/main/java/com/owncloud/android/presentation/viewmodels/sharing/OCShareViewModel.kt b/...pp/src/main/java/com/owncloud/android/presentation/viewmodels/sharing/OCShareViewModel.kt
@@ -154,18 +154,10 @@ class OCShareViewModel(
     /******************************************************************************************************
      ******************************************* PRIVATE SHARES *******************************************
      ******************************************************************************************************/
+
     private val _privateShareCreationStatus = MutableLiveData<UIResult<Unit>>()
     val privateShareCreationStatus: LiveData<UIResult<Unit>> = _privateShareCreationStatus
 
-    private val _privateShare = MutableLiveData<UIResult<OCShareEntity>>()
-    val privateShare: LiveData<UIResult<OCShareEntity>> = _privateShare
-
-    private var privateShareLiveData: LiveData<OCShareEntity>? = null
-    private lateinit var privateShareObserver: Observer<OCShareEntity>
-
-    private val _privateShareEditionStatus = MutableLiveData<UIResult<Unit>>()
-    val privateShareEditionStatus: LiveData<UIResult<Unit>> = _privateShareEditionStatus
-
     fun insertPrivateShare(
         filePath: String,
         shareType: ShareType?,
@@ -205,7 +197,13 @@ class OCShareViewModel(
         }
     }
 
-    // Used to get a private share after updating
+    private val _privateShare = MutableLiveData<UIResult<OCShareEntity>>()
+    val privateShare: LiveData<UIResult<OCShareEntity>> = _privateShare
+
+    private var privateShareLiveData: LiveData<OCShareEntity>? = null
+    private lateinit var privateShareObserver: Observer<OCShareEntity>
+
+    // Used to get a specific private share after updating it
     fun refreshPrivateShare(
         remoteId: Long
     ) {
@@ -220,6 +218,9 @@ class OCShareViewModel(
         privateShareLiveData?.observeForever(privateShareObserver)
     }
 
+    private val _privateShareEditionStatus = MutableLiveData<UIResult<Unit>>()
+    val privateShareEditionStatus: LiveData<UIResult<Unit>> = _privateShareEditionStatus
+
     fun updatePrivateShare(
         remoteId: Long,
         permissions: Int
@@ -264,9 +265,6 @@ class OCShareViewModel(
     private val _publicShareCreationStatus = MutableLiveData<UIResult<Unit>>()
     val publicShareCreationStatus: LiveData<UIResult<Unit>> = _publicShareCreationStatus
 
-    private val _publicShareEditionStatus = MutableLiveData<UIResult<Unit>>()
-    val publicShareEditionStatus: LiveData<UIResult<Unit>> = _publicShareEditionStatus
-
     fun insertPublicShare(
         filePath: String,
         permissions: Int,
@@ -312,6 +310,9 @@ class OCShareViewModel(
         }
     }
 
+    private val _publicShareEditionStatus = MutableLiveData<UIResult<Unit>>()
+    val publicShareEditionStatus: LiveData<UIResult<Unit>> = _publicShareEditionStatus
+
     fun updatePublicShare(
         remoteId: Long,
         name: String,

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -50,6 +50,7 @@
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.controller.TransferProgressController;
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.ui.dialog.RenameFileDialogFragment;

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -67,6 +67,7 @@
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.FolderPickerActivity;
 import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;
 import com.owncloud.android.ui.adapter.FileListListAdapter;

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -55,6 +55,7 @@
 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.utils.Extras;
 import com.owncloud.android.utils.PreferenceUtils;

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoFragment.java
@@ -58,6 +58,7 @@
 import com.owncloud.android.files.FileMenuFilter;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.controller.TransferProgressController;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
+1 −1		build.gradle
+1 −1		gradle/wrapper/gradle-wrapper.properties
+2 −3		owncloudComLibrary/build.gradle
+0 −31		owncloudComLibrary/src/debug/java/com/owncloud/android/lib/testing/OpenForTesting.kt
+0 −110		owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClientFactory.java
+0 −1		...ibrary/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java
+2 −2		owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java
+1 −1		owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java
+3 −2		owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+1 −6		owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt
+1 −1		owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.kt
+0 −1		owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareType.kt
+5 −5		owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt
+0 −2		owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.kt
+0 −31		owncloudComLibrary/src/release/java/com/owncloud/android/lib/testing/OpenForTesting.kt