Merge pull request #4918 from Infomaniak/fix/calendar-not-refreshed

Resolved issue relative to calendar refresh in link-sharing

src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java

@@ -336,7 +336,8 @@ public class UserListAdapter extends RecyclerView.Adapter<UserListAdapter.UserVi
                 return true;
             }
             case R.id.action_expiration_date: {
-                ExpirationDatePickerDialogFragment dialog = ExpirationDatePickerDialogFragment.newInstance(share, -1);
+                ExpirationDatePickerDialogFragment dialog = ExpirationDatePickerDialogFragment
+                    .newInstance(share, share.getExpirationDate());
                 dialog.show(fragmentManager, ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG);
                 return true;
             }

src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

@@ -461,7 +461,8 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
                 return true;
             }
             case R.id.action_share_expiration_date: {
-                ExpirationDatePickerDialogFragment dialog = ExpirationDatePickerDialogFragment.newInstance(file, -1);
+                ExpirationDatePickerDialogFragment dialog = ExpirationDatePickerDialogFragment
+                    .newInstance(file, publicShare.getExpirationDate());
                 dialog.show(
                     fileDisplayActivity.getSupportFragmentManager(),
                         ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG

src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java

@@ -351,7 +351,8 @@ public class ShareFileFragment extends Fragment implements ShareUserListAdapter.
                 return;
             }
             if (isChecked) {
-                ExpirationDatePickerDialogFragment dialog = ExpirationDatePickerDialogFragment.newInstance(mFile, -1);
+                ExpirationDatePickerDialogFragment dialog = ExpirationDatePickerDialogFragment
+                    .newInstance(mFile, mPublicShare.getExpirationDate());
                 dialog.show(
                         getActivity().getSupportFragmentManager(),
                         ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG
@@ -378,7 +379,8 @@ public class ShareFileFragment extends Fragment implements ShareUserListAdapter.
             if (mPublicShare != null && mPublicShare.getExpirationDate() > 0) {
                 long chosenDateInMillis = mPublicShare.getExpirationDate();
                 ExpirationDatePickerDialogFragment dialog =
-                        ExpirationDatePickerDialogFragment.newInstance(mFile, chosenDateInMillis);
+                        ExpirationDatePickerDialogFragment
+                            .newInstance(mFile, chosenDateInMillis);
                 dialog.show(
                         getActivity().getSupportFragmentManager(),
                         ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG