|
@@ -29,7 +29,6 @@ import android.content.Intent;
|
|
|
import android.content.pm.PackageManager;
|
|
|
import android.content.pm.ResolveInfo;
|
|
|
import android.net.Uri;
|
|
|
-import android.os.Parcelable;
|
|
|
import android.support.annotation.Nullable;
|
|
|
import android.support.v4.app.DialogFragment;
|
|
|
import android.webkit.MimeTypeMap;
|
|
@@ -373,8 +372,8 @@ public class FileOperationsHelper {
|
|
|
*/
|
|
|
public void showShareFile(OCFile file){
|
|
|
Intent intent = new Intent(mFileActivity, ShareActivity.class);
|
|
|
- intent.putExtra(mFileActivity.EXTRA_FILE, (Parcelable) file);
|
|
|
- intent.putExtra(mFileActivity.EXTRA_ACCOUNT, mFileActivity.getAccount());
|
|
|
+ intent.putExtra(FileActivity.EXTRA_FILE, file);
|
|
|
+ intent.putExtra(FileActivity.EXTRA_ACCOUNT, mFileActivity.getAccount());
|
|
|
mFileActivity.startActivity(intent);
|
|
|
|
|
|
}
|
|
@@ -481,13 +480,11 @@ public class FileOperationsHelper {
|
|
|
OwnCloudVersion serverVersion = AccountUtils.getServerVersion(mFileActivity.getAccount());
|
|
|
|
|
|
if (serverVersion != null && serverVersion.isNotReshareableFederatedSupported()) {
|
|
|
- updateShareIntent.
|
|
|
- putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS,
|
|
|
- OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_AFTER_OC9);
|
|
|
+ updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS,
|
|
|
+ OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_AFTER_OC9);
|
|
|
} else {
|
|
|
- updateShareIntent.
|
|
|
- putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS,
|
|
|
- OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9);
|
|
|
+ updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS,
|
|
|
+ OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_UP_TO_OC9);
|
|
|
}
|
|
|
}
|
|
|
|