Loading app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java +12 −3 Original line number Diff line number Diff line Loading @@ -611,13 +611,13 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap @Override public void advancedPermissions(OCShare share) { // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION); modifyExistingShare(share, NoteShareDetailActivity.SCREEN_TYPE_PERMISSION); } @Override public void sendNewEmail(OCShare share) { // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE); modifyExistingShare(share, NoteShareDetailActivity.SCREEN_TYPE_NOTE); } @Override Loading Loading @@ -649,7 +649,16 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap } private void modifyExistingShare(OCShare share, int screenTypePermission) { // editExistingShare(share, screenTypePermission, !isReshareForbidden(share), capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18)); Bundle bundle = new Bundle(); bundle.putSerializable(NoteShareDetailActivity.ARG_OCSHARE, share); bundle.putInt(NoteShareDetailActivity.ARG_SCREEN_TYPE, screenTypePermission); bundle.putBoolean(NoteShareDetailActivity.ARG_RESHARE_SHOWN, !isReshareForbidden(share)); bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, true); // TODO: capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18) Intent intent = new Intent(this, NoteShareDetailActivity.class); intent.putExtras(bundle); startActivity(intent); } @Override Loading app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt +0 −43 Original line number Diff line number Diff line Loading @@ -54,49 +54,6 @@ class NoteShareDetailActivity : BrandedActivity(), // types of screens to be displayed const val SCREEN_TYPE_PERMISSION = 1 // permissions screen const val SCREEN_TYPE_NOTE = 2 // note screen /* /** * fragment instance to be called while creating new share for internal and external share */ @JvmStatic fun newInstance( file: OCFile, shareeName: String, shareType: ShareType, secureShare: Boolean ): FileDetailsSharingProcessFragment { val args = Bundle() args.putParcelable(ARG_OCFILE, file) args.putSerializable(ARG_SHARE_TYPE, shareType) args.putString(ARG_SHAREE_NAME, shareeName) args.putBoolean(ARG_SECURE_SHARE, secureShare) val fragment = FileDetailsSharingProcessFragment() fragment.arguments = args return fragment } /** * fragment instance to be called while modifying existing share information */ @JvmStatic fun newInstance( share: OCShare, screenType: Int, isReshareShown: Boolean, isExpirationDateShown: Boolean ): FileDetailsSharingProcessFragment { val args = Bundle() args.putParcelable(ARG_OCSHARE, share) args.putInt(ARG_SCREEN_TYPE, screenType) args.putBoolean(ARG_RESHARE_SHOWN, isReshareShown) args.putBoolean(ARG_EXP_DATE_SHOWN, isExpirationDateShown) val fragment = FileDetailsSharingProcessFragment() fragment.arguments = args return fragment } */ } private lateinit var binding: ActivityNoteShareDetailBinding Loading Loading
app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java +12 −3 Original line number Diff line number Diff line Loading @@ -611,13 +611,13 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap @Override public void advancedPermissions(OCShare share) { // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION); modifyExistingShare(share, NoteShareDetailActivity.SCREEN_TYPE_PERMISSION); } @Override public void sendNewEmail(OCShare share) { // modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_NOTE); modifyExistingShare(share, NoteShareDetailActivity.SCREEN_TYPE_NOTE); } @Override Loading Loading @@ -649,7 +649,16 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap } private void modifyExistingShare(OCShare share, int screenTypePermission) { // editExistingShare(share, screenTypePermission, !isReshareForbidden(share), capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18)); Bundle bundle = new Bundle(); bundle.putSerializable(NoteShareDetailActivity.ARG_OCSHARE, share); bundle.putInt(NoteShareDetailActivity.ARG_SCREEN_TYPE, screenTypePermission); bundle.putBoolean(NoteShareDetailActivity.ARG_RESHARE_SHOWN, !isReshareForbidden(share)); bundle.putBoolean(NoteShareDetailActivity.ARG_EXP_DATE_SHOWN, true); // TODO: capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18) Intent intent = new Intent(this, NoteShareDetailActivity.class); intent.putExtras(bundle); startActivity(intent); } @Override Loading
app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt +0 −43 Original line number Diff line number Diff line Loading @@ -54,49 +54,6 @@ class NoteShareDetailActivity : BrandedActivity(), // types of screens to be displayed const val SCREEN_TYPE_PERMISSION = 1 // permissions screen const val SCREEN_TYPE_NOTE = 2 // note screen /* /** * fragment instance to be called while creating new share for internal and external share */ @JvmStatic fun newInstance( file: OCFile, shareeName: String, shareType: ShareType, secureShare: Boolean ): FileDetailsSharingProcessFragment { val args = Bundle() args.putParcelable(ARG_OCFILE, file) args.putSerializable(ARG_SHARE_TYPE, shareType) args.putString(ARG_SHAREE_NAME, shareeName) args.putBoolean(ARG_SECURE_SHARE, secureShare) val fragment = FileDetailsSharingProcessFragment() fragment.arguments = args return fragment } /** * fragment instance to be called while modifying existing share information */ @JvmStatic fun newInstance( share: OCShare, screenType: Int, isReshareShown: Boolean, isExpirationDateShown: Boolean ): FileDetailsSharingProcessFragment { val args = Bundle() args.putParcelable(ARG_OCSHARE, share) args.putInt(ARG_SCREEN_TYPE, screenType) args.putBoolean(ARG_RESHARE_SHOWN, isReshareShown) args.putBoolean(ARG_EXP_DATE_SHOWN, isExpirationDateShown) val fragment = FileDetailsSharingProcessFragment() fragment.arguments = args return fragment } */ } private lateinit var binding: ActivityNoteShareDetailBinding Loading