Skip to content

Commit 737a489

Browse files
alperozturk96alperozturk96
authored
Merge pull request #15459 from nextcloud/dropNC19
Drop NC18/19
2 parents 9a0447d + a859cf1 commit 737a489

11 files changed

Lines changed: 27 additions & 35 deletions

File tree

‎app/src/androidTest/java/com/nextcloud/client/account/RegisteredUserTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import android.net.Uri
1212
import android.os.Parcel
1313
import com.owncloud.android.lib.common.OwnCloudAccount
1414
import com.owncloud.android.lib.common.OwnCloudBasicCredentials
15-
import com.owncloud.android.lib.resources.status.OwnCloudVersion
15+
import com.owncloud.android.lib.resources.status.NextcloudVersion
1616
import org.junit.Assert.assertEquals
1717
import org.junit.Assert.assertFalse
1818
import org.junit.Assert.assertNotSame
@@ -31,7 +31,7 @@ class RegisteredUserTest {
3131
val ownCloudAccount = OwnCloudAccount(uri, credentials)
3232
val server = Server(
3333
uri = URI(uri.toString()),
34-
version = OwnCloudVersion.nextcloud_18
34+
version = NextcloudVersion.nextcloud_31
3535
)
3636
return RegisteredUser(
3737
account = account,

‎app/src/androidTest/java/com/nextcloud/client/files/DeepLinkHandlerTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class DeepLinkHandlerTest {
107107
fun createMockUser(serverBaseUrl: String): User {
108108
val user = mock<User>()
109109
val uri = URI.create(serverBaseUrl)
110-
val server = Server(uri = uri, version = OwnCloudVersion.nextcloud_19)
110+
val server = Server(uri = uri, version = OwnCloudVersion.nextcloud_20)
111111
whenever(user.server).thenReturn(server)
112112
return user
113113
}

‎app/src/androidTest/java/com/owncloud/android/utils/theme/CapabilityUtilsIT.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ class CapabilityUtilsIT : AbstractIT() {
3030
assertTrue(test(NextcloudVersion.nextcloud_22))
3131
assertTrue(test(NextcloudVersion.nextcloud_21))
3232
assertTrue(test(OwnCloudVersion.nextcloud_20))
33-
assertTrue(test(OwnCloudVersion.nextcloud_19))
34-
assertTrue(test(OwnCloudVersion.nextcloud_18))
3533
}
3634

3735
private fun test(version: OwnCloudVersion): Boolean =

‎app/src/main/java/com/owncloud/android/MainApp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
*/
131131
public class MainApp extends Application implements HasAndroidInjector, NetworkChangeListener {
132132
public static final OwnCloudVersion OUTDATED_SERVER_VERSION = NextcloudVersion.nextcloud_29;
133-
public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_18;
133+
public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_20;
134134

135135
private static final String TAG = MainApp.class.getSimpleName();
136136
public static final String DOT = ".";

‎app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import com.nextcloud.receiver.NetworkChangeListener;
4242
import com.nextcloud.receiver.NetworkChangeReceiver;
4343
import com.nextcloud.utils.EditorUtils;
44-
import com.nextcloud.utils.extensions.ActivityExtensionsKt;
4544
import com.nextcloud.utils.extensions.BundleExtensionsKt;
4645
import com.nextcloud.utils.extensions.FileExtensionsKt;
4746
import com.nextcloud.utils.extensions.IntentExtensionsKt;
@@ -970,14 +969,12 @@ protected void doShareWith(String shareeName, ShareType shareType) {
970969
* @param share
971970
* @param screenTypePermission
972971
* @param isReshareShown
973-
* @param isExpiryDateShown
974972
*/
975973
@Override
976-
public void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
977-
boolean isExpiryDateShown) {
974+
public void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown) {
978975
FileDetailFragment fragment = getFileDetailFragment();
979976
if (fragment != null) {
980-
fragment.editExistingShare(share, screenTypePermission, isReshareShown, isExpiryDateShown);
977+
fragment.editExistingShare(share, screenTypePermission, isReshareShown);
981978
}
982979
}
983980

‎app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -859,13 +859,10 @@ public void showHideFragmentView(boolean isFragmentReplaced) {
859859
* @param share
860860
* @param screenTypePermission
861861
* @param isReshareShown
862-
* @param isExpiryDateShown
863862
*/
864-
public void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
865-
boolean isExpiryDateShown) {
863+
public void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown) {
866864
requireActivity().getSupportFragmentManager().beginTransaction().add(R.id.sharing_frame_container,
867-
FileDetailsSharingProcessFragment.newInstance(share, screenTypePermission, isReshareShown,
868-
isExpiryDateShown),
865+
FileDetailsSharingProcessFragment.newInstance(share, screenTypePermission, isReshareShown),
869866
FileDetailsSharingProcessFragment.TAG)
870867
.commit();
871868
showHideFragmentView(true);

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
import com.owncloud.android.lib.resources.shares.ShareType;
5757
import com.owncloud.android.lib.resources.status.NextcloudVersion;
5858
import com.owncloud.android.lib.resources.status.OCCapability;
59-
import com.owncloud.android.lib.resources.status.OwnCloudVersion;
6059
import com.owncloud.android.providers.UsersAndGroupsSearchConfig;
6160
import com.owncloud.android.ui.activity.FileActivity;
6261
import com.owncloud.android.ui.activity.FileDisplayActivity;
@@ -729,8 +728,7 @@ public void addAnotherLink(OCShare share) {
729728
}
730729

731730
private void modifyExistingShare(OCShare share, int screenTypePermission) {
732-
onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share),
733-
capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
731+
onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share));
734732
}
735733

736734
@Override
@@ -776,8 +774,7 @@ public void openShareDetailWithCustomPermissions(OCShare share) {
776774
});
777775

778776
public interface OnEditShareListener {
779-
void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
780-
boolean isExpiryDateShown);
777+
void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown);
781778

782779
void onShareProcessClosed();
783780
}

‎app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ class FileDetailsSharingProcessFragment :
6767
private const val ARG_OCSHARE = "arg_ocshare"
6868
private const val ARG_SCREEN_TYPE = "arg_screen_type"
6969
private const val ARG_RESHARE_SHOWN = "arg_reshare_shown"
70-
private const val ARG_EXP_DATE_SHOWN = "arg_exp_date_shown"
7170
private const val ARG_SECURE_SHARE = "secure_share"
7271

7372
// types of screens to be displayed
@@ -101,17 +100,11 @@ class FileDetailsSharingProcessFragment :
101100
* fragment instance to be called while modifying existing share information
102101
*/
103102
@JvmStatic
104-
fun newInstance(
105-
share: OCShare,
106-
screenType: Int,
107-
isReshareShown: Boolean,
108-
isExpirationDateShown: Boolean
109-
): FileDetailsSharingProcessFragment {
103+
fun newInstance(share: OCShare, screenType: Int, isReshareShown: Boolean): FileDetailsSharingProcessFragment {
110104
val bundle = Bundle().apply {
111105
putParcelable(ARG_OCSHARE, share)
112106
putInt(ARG_SCREEN_TYPE, screenType)
113107
putBoolean(ARG_RESHARE_SHOWN, isReshareShown)
114-
putBoolean(ARG_EXP_DATE_SHOWN, isExpirationDateShown)
115108
}
116109

117110
return FileDetailsSharingProcessFragment().apply {
@@ -138,7 +131,6 @@ class FileDetailsSharingProcessFragment :
138131

139132
private var share: OCShare? = null
140133
private var isReShareShown: Boolean = true // show or hide reShare option
141-
private var isExpDateShown: Boolean = true // show or hide expiry date option
142134
private var isSecureShare: Boolean = false
143135

144136
private lateinit var capabilities: OCCapability
@@ -183,7 +175,6 @@ class FileDetailsSharingProcessFragment :
183175

184176
shareProcessStep = it.getInt(ARG_SCREEN_TYPE, SCREEN_TYPE_PERMISSION)
185177
isReShareShown = it.getBoolean(ARG_RESHARE_SHOWN, true)
186-
isExpDateShown = it.getBoolean(ARG_EXP_DATE_SHOWN, true)
187178
isSecureShare = it.getBoolean(ARG_SECURE_SHARE, false)
188179
}
189180
}
@@ -299,7 +290,7 @@ class FileDetailsSharingProcessFragment :
299290
updateView()
300291

301292
// show or hide expiry date
302-
binding.shareProcessSetExpDateSwitch.setVisibleIf(isExpDateShown && !isSecureShare)
293+
binding.shareProcessSetExpDateSwitch.setVisibleIf(!isSecureShare)
303294
shareProcessStep = SCREEN_TYPE_PERMISSION
304295
}
305296

‎app/src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import com.nextcloud.client.account.UserAccountManager
1616
import com.nextcloud.client.logger.Logger
1717
import com.nextcloud.common.PlainClient
1818
import com.nextcloud.operations.GetMethod
19+
import com.owncloud.android.lib.resources.status.NextcloudVersion
1920
import com.owncloud.android.lib.resources.status.OwnCloudVersion
2021
import org.apache.commons.httpclient.HttpStatus
2122
import org.junit.Assert.assertFalse
@@ -93,8 +94,8 @@ class ConnectivityServiceTest {
9394
lateinit var logger: Logger
9495

9596
val baseServerUri = URI.create(SERVER_BASE_URL)
96-
val newServer = Server(baseServerUri, OwnCloudVersion.nextcloud_20)
97-
val legacyServer = Server(baseServerUri, OwnCloudVersion.nextcloud_18)
97+
val newServer = Server(baseServerUri, NextcloudVersion.nextcloud_31)
98+
val legacyServer = Server(baseServerUri, OwnCloudVersion.nextcloud_20)
9899

99100
@Mock
100101
lateinit var user: User

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
buildscript {
1212
ext {
13-
androidLibraryVersion ="96edde89836a22b1f56fefa4c1de90353adb92b2"
13+
androidLibraryVersion = "3b835f2084c2564c91dd2d539322a7c586123e20"
1414
androidCommonLibraryVersion = "0.27.2"
1515
androidPluginVersion = '8.13.0'
1616
androidxMediaVersion = "1.5.1"

0 commit comments

Comments
 (0)