Merge pull request #15459 from nextcloud/dropNC19

Drop NC18/19

Author: alperozturk96

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

@@ -12,7 +12,7 @@ import android.net.Uri
 import android.os.Parcel
 import com.owncloud.android.lib.common.OwnCloudAccount
 import com.owncloud.android.lib.common.OwnCloudBasicCredentials
-import com.owncloud.android.lib.resources.status.OwnCloudVersion
+import com.owncloud.android.lib.resources.status.NextcloudVersion
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotSame
@@ -31,7 +31,7 @@ class RegisteredUserTest {
             val ownCloudAccount = OwnCloudAccount(uri, credentials)
             val server = Server(
                 uri = URI(uri.toString()),
-                version = OwnCloudVersion.nextcloud_18
+                version = NextcloudVersion.nextcloud_31
             )
             return RegisteredUser(
                 account = account,

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

@@ -107,7 +107,7 @@ class DeepLinkHandlerTest {
             fun createMockUser(serverBaseUrl: String): User {
                 val user = mock<User>()
                 val uri = URI.create(serverBaseUrl)
-                val server = Server(uri = uri, version = OwnCloudVersion.nextcloud_19)
+                val server = Server(uri = uri, version = OwnCloudVersion.nextcloud_20)
                 whenever(user.server).thenReturn(server)
                 return user
             }

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

@@ -30,8 +30,6 @@ class CapabilityUtilsIT : AbstractIT() {
         assertTrue(test(NextcloudVersion.nextcloud_22))
         assertTrue(test(NextcloudVersion.nextcloud_21))
         assertTrue(test(OwnCloudVersion.nextcloud_20))
-        assertTrue(test(OwnCloudVersion.nextcloud_19))
-        assertTrue(test(OwnCloudVersion.nextcloud_18))
     }
 
     private fun test(version: OwnCloudVersion): Boolean =

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

@@ -130,7 +130,7 @@
  */
 public class MainApp extends Application implements HasAndroidInjector, NetworkChangeListener {
     public static final OwnCloudVersion OUTDATED_SERVER_VERSION = NextcloudVersion.nextcloud_29;
-    public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_18;
+    public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_20;
 
     private static final String TAG = MainApp.class.getSimpleName();
     public static final String DOT = ".";

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

@@ -41,7 +41,6 @@
 import com.nextcloud.receiver.NetworkChangeListener;
 import com.nextcloud.receiver.NetworkChangeReceiver;
 import com.nextcloud.utils.EditorUtils;
-import com.nextcloud.utils.extensions.ActivityExtensionsKt;
 import com.nextcloud.utils.extensions.BundleExtensionsKt;
 import com.nextcloud.utils.extensions.FileExtensionsKt;
 import com.nextcloud.utils.extensions.IntentExtensionsKt;
@@ -970,14 +969,12 @@ protected void doShareWith(String shareeName, ShareType shareType) {
      * @param share
      * @param screenTypePermission
      * @param isReshareShown
-     * @param isExpiryDateShown
      */
     @Override
-    public void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
-                                  boolean isExpiryDateShown) {
+    public void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown) {
         FileDetailFragment fragment = getFileDetailFragment();
         if (fragment != null) {
-            fragment.editExistingShare(share, screenTypePermission, isReshareShown, isExpiryDateShown);
+            fragment.editExistingShare(share, screenTypePermission, isReshareShown);
         }
     }
 

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

@@ -859,13 +859,10 @@ public void showHideFragmentView(boolean isFragmentReplaced) {
      * @param share
      * @param screenTypePermission
      * @param isReshareShown
-     * @param isExpiryDateShown
      */
-    public void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
-                                  boolean isExpiryDateShown) {
+    public void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown) {
         requireActivity().getSupportFragmentManager().beginTransaction().add(R.id.sharing_frame_container,
-                                                                             FileDetailsSharingProcessFragment.newInstance(share, screenTypePermission, isReshareShown,
-                                                                                                                           isExpiryDateShown),
+                                                                             FileDetailsSharingProcessFragment.newInstance(share, screenTypePermission, isReshareShown),
                                                                              FileDetailsSharingProcessFragment.TAG)
             .commit();
         showHideFragmentView(true);

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

@@ -56,7 +56,6 @@
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.status.NextcloudVersion;
 import com.owncloud.android.lib.resources.status.OCCapability;
-import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.providers.UsersAndGroupsSearchConfig;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
@@ -729,8 +728,7 @@ public void addAnotherLink(OCShare share) {
     }
 
     private void modifyExistingShare(OCShare share, int screenTypePermission) {
-        onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share),
-                                              capabilities.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_18));
+        onEditShareListener.editExistingShare(share, screenTypePermission, !isReshareForbidden(share));
     }
 
     @Override
@@ -776,8 +774,7 @@ public void openShareDetailWithCustomPermissions(OCShare share) {
                                   });
 
     public interface OnEditShareListener {
-        void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown,
-                               boolean isExpiryDateShown);
+        void editExistingShare(OCShare share, int screenTypePermission, boolean isReshareShown);
 
         void onShareProcessClosed();
     }

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

@@ -67,7 +67,6 @@ class FileDetailsSharingProcessFragment :
         private const val ARG_OCSHARE = "arg_ocshare"
         private const val ARG_SCREEN_TYPE = "arg_screen_type"
         private const val ARG_RESHARE_SHOWN = "arg_reshare_shown"
-        private const val ARG_EXP_DATE_SHOWN = "arg_exp_date_shown"
         private const val ARG_SECURE_SHARE = "secure_share"
 
         // types of screens to be displayed
@@ -101,17 +100,11 @@ class FileDetailsSharingProcessFragment :
          * fragment instance to be called while modifying existing share information
          */
         @JvmStatic
-        fun newInstance(
-            share: OCShare,
-            screenType: Int,
-            isReshareShown: Boolean,
-            isExpirationDateShown: Boolean
-        ): FileDetailsSharingProcessFragment {
+        fun newInstance(share: OCShare, screenType: Int, isReshareShown: Boolean): FileDetailsSharingProcessFragment {
             val bundle = Bundle().apply {
                 putParcelable(ARG_OCSHARE, share)
                 putInt(ARG_SCREEN_TYPE, screenType)
                 putBoolean(ARG_RESHARE_SHOWN, isReshareShown)
-                putBoolean(ARG_EXP_DATE_SHOWN, isExpirationDateShown)
             }
 
             return FileDetailsSharingProcessFragment().apply {
@@ -138,7 +131,6 @@ class FileDetailsSharingProcessFragment :
 
     private var share: OCShare? = null
     private var isReShareShown: Boolean = true // show or hide reShare option
-    private var isExpDateShown: Boolean = true // show or hide expiry date option
     private var isSecureShare: Boolean = false
 
     private lateinit var capabilities: OCCapability
@@ -183,7 +175,6 @@ class FileDetailsSharingProcessFragment :
 
             shareProcessStep = it.getInt(ARG_SCREEN_TYPE, SCREEN_TYPE_PERMISSION)
             isReShareShown = it.getBoolean(ARG_RESHARE_SHOWN, true)
-            isExpDateShown = it.getBoolean(ARG_EXP_DATE_SHOWN, true)
             isSecureShare = it.getBoolean(ARG_SECURE_SHARE, false)
         }
     }
@@ -299,7 +290,7 @@ class FileDetailsSharingProcessFragment :
         updateView()
 
         // show or hide expiry date
-        binding.shareProcessSetExpDateSwitch.setVisibleIf(isExpDateShown && !isSecureShare)
+        binding.shareProcessSetExpDateSwitch.setVisibleIf(!isSecureShare)
         shareProcessStep = SCREEN_TYPE_PERMISSION
     }
 

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

@@ -16,6 +16,7 @@ import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.logger.Logger
 import com.nextcloud.common.PlainClient
 import com.nextcloud.operations.GetMethod
+import com.owncloud.android.lib.resources.status.NextcloudVersion
 import com.owncloud.android.lib.resources.status.OwnCloudVersion
 import org.apache.commons.httpclient.HttpStatus
 import org.junit.Assert.assertFalse
@@ -93,8 +94,8 @@ class ConnectivityServiceTest {
         lateinit var logger: Logger
 
         val baseServerUri = URI.create(SERVER_BASE_URL)
-        val newServer = Server(baseServerUri, OwnCloudVersion.nextcloud_20)
-        val legacyServer = Server(baseServerUri, OwnCloudVersion.nextcloud_18)
+        val newServer = Server(baseServerUri, NextcloudVersion.nextcloud_31)
+        val legacyServer = Server(baseServerUri, OwnCloudVersion.nextcloud_20)
 
         @Mock
         lateinit var user: User

build.gradle

@@ -10,7 +10,7 @@
  */
 buildscript {
     ext {
-        androidLibraryVersion ="96edde89836a22b1f56fefa4c1de90353adb92b2"
+        androidLibraryVersion = "3b835f2084c2564c91dd2d539322a7c586123e20"
         androidCommonLibraryVersion = "0.27.2"
         androidPluginVersion = '8.13.0'
         androidxMediaVersion = "1.5.1"