From 16997601fcb84de844f17bb44a58e421f13ac24e Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 2 Nov 2020 10:41:24 +0100 Subject: [PATCH] Drop NC13-NC15 in 204 endpoint there is no maintenance:false Signed-off-by: tobiasKaminsky --- .../client/account/UserAccountManager.java | 13 --- .../account/UserAccountManagerImpl.java | 5 -- .../network/ConnectivityServiceImpl.java | 29 +----- .../java/com/owncloud/android/MainApp.java | 6 +- .../android/ui/activity/DrawerActivity.java | 2 +- .../ui/activity/FileDisplayActivity.java | 16 ++-- .../ui/adapter/ActivityListAdapter.java | 90 ++----------------- .../FileDetailActivitiesFragment.java | 5 +- .../ui/fragment/FileDetailFragment.java | 2 +- .../fragment/FileDetailSharingFragment.java | 7 +- .../ui/fragment/OCFileListFragment.java | 11 +-- .../ui/fragment/util/SharingMenuHelper.java | 9 +- .../ui/preview/PreviewImageFragment.java | 2 +- .../ui/preview/PreviewMediaFragment.java | 4 +- .../ui/preview/PreviewTextFileFragment.java | 4 +- .../android/utils/DrawerMenuUtil.java | 7 +- .../client/network/ConnectivityServiceTest.kt | 16 ++-- 17 files changed, 41 insertions(+), 187 deletions(-) diff --git a/src/main/java/com/nextcloud/client/account/UserAccountManager.java b/src/main/java/com/nextcloud/client/account/UserAccountManager.java index 8eca155bf46b..995ae2458cb9 100644 --- a/src/main/java/com/nextcloud/client/account/UserAccountManager.java +++ b/src/main/java/com/nextcloud/client/account/UserAccountManager.java @@ -121,19 +121,6 @@ public interface UserAccountManager extends CurrentAccountProvider { @NonNull OwnCloudVersion getServerVersion(Account account); - /** - * Check if user's account supports media streaming. This is a property of server where user has his account. - * - * @deprecated Please use {@link OwnCloudVersion#isMediaStreamingSupported()} directly, - * obtainable from {@link User#getServer()} and {@link Server#getVersion()} - * - * @param account Account used to perform {@link android.accounts.AccountManager} lookup. - * - * @return true is server supports media streaming, false otherwise - */ - @Deprecated - boolean isMediaStreamingSupported(@Nullable Account account); - void resetOwnCloudAccount(); /** diff --git a/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java b/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java index 67c7db5006ee..79371629857a 100644 --- a/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java +++ b/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java @@ -327,11 +327,6 @@ public OwnCloudVersion getServerVersion(Account account) { return serverVersion; } - @Override - public boolean isMediaStreamingSupported(Account account) { - return account != null && getServerVersion(account).isMediaStreamingSupported(); - } - @Override public void resetOwnCloudAccount() { SharedPreferences.Editor appPrefs = PreferenceManager.getDefaultSharedPreferences(context).edit(); diff --git a/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java b/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java index d0d98589e5a8..38da063bdbe7 100644 --- a/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java +++ b/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java @@ -26,12 +26,10 @@ import com.nextcloud.client.account.Server; import com.nextcloud.client.account.UserAccountManager; import com.nextcloud.client.logger.Logger; -import com.owncloud.android.lib.resources.status.OwnCloudVersion; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.GetMethod; -import org.json.JSONObject; import java.io.IOException; @@ -79,35 +77,14 @@ public boolean isInternetWalled() { if (baseServerAddress.isEmpty()) { return true; } - String url; - if (server.getVersion().compareTo(OwnCloudVersion.nextcloud_13) > 0) { - url = baseServerAddress + "/index.php/204"; - } else { - url = baseServerAddress + "/status.php"; - } - get = requestBuilder.invoke(url); + get = requestBuilder.invoke(baseServerAddress + "/index.php/204"); HttpClient client = clientFactory.createPlainClient(); int status = client.executeMethod(get); - if (server.getVersion().compareTo(OwnCloudVersion.nextcloud_13) > 0) { - return !(status == HttpStatus.SC_NO_CONTENT && - (get.getResponseContentLength() == -1 || get.getResponseContentLength() == 0)); - } else { - if (status == HttpStatus.SC_OK) { - try { - // try parsing json to verify response - // check if json contains maintenance and it should be false - String json = get.getResponseBodyAsString(); - return new JSONObject(json).getBoolean("maintenance"); - } catch (Exception e) { - return true; - } - } else { - return true; - } - } + return !(status == HttpStatus.SC_NO_CONTENT && + (get.getResponseContentLength() == -1 || get.getResponseContentLength() == 0)); } catch (IOException e) { logger.e(TAG, "Error checking internet connection", e); } finally { diff --git a/src/main/java/com/owncloud/android/MainApp.java b/src/main/java/com/owncloud/android/MainApp.java index b0f93d6824c6..32f5d13d3431 100644 --- a/src/main/java/com/owncloud/android/MainApp.java +++ b/src/main/java/com/owncloud/android/MainApp.java @@ -115,13 +115,13 @@ /** * Main Application of the project - * + *

* Contains methods to build the "static" strings. These strings were before constants in different classes */ public class MainApp extends MultiDexApplication implements HasAndroidInjector { - public static final OwnCloudVersion OUTDATED_SERVER_VERSION = OwnCloudVersion.nextcloud_16; - public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_13; + public static final OwnCloudVersion OUTDATED_SERVER_VERSION = OwnCloudVersion.nextcloud_17; + public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_16; private static final String TAG = MainApp.class.getSimpleName(); public static final String DOT = "."; diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index 2cbd300e732b..5d71624f48da 100644 --- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -303,7 +303,7 @@ private void filterDrawerMenu(final Menu menu, @NonNull final User user) { OCCapability capability = storageManager.getCapability(user.getAccountName()); DrawerMenuUtil.filterSearchMenuItems(menu, user, getResources()); - DrawerMenuUtil.filterTrashbinMenuItem(menu, user, capability); + DrawerMenuUtil.filterTrashbinMenuItem(menu, capability); DrawerMenuUtil.filterActivityMenuItem(menu, capability); DrawerMenuUtil.setupHomeMenuItem(menu, getResources()); diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index b0937b68f095..ce01b53192a7 100644 --- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -689,9 +689,7 @@ protected void refreshSecondFragment(String downloadEvent, String downloadedRemo mWaitingToPreview = getStorageManager().getFileById(mWaitingToPreview.getFileId()); if (PreviewMediaFragment.canBePreviewed(mWaitingToPreview)) { - boolean streaming = AccountUtils.getServerVersionForAccount(getAccount(), this) - .isMediaStreamingSupported(); - startMediaPreview(mWaitingToPreview, 0, true, true, streaming); + startMediaPreview(mWaitingToPreview, 0, true, true, true); detailsFragmentChanged = true; } else if (MimeTypeUtil.isVCard(mWaitingToPreview.getMimeType())) { startContactListFragment(mWaitingToPreview); @@ -1876,9 +1874,7 @@ private void onRenameFileOperationFinish(RenameFileOperation operation, ((PreviewMediaFragment) details).updateFile(renamedFile); if (PreviewMediaFragment.canBePreviewed(renamedFile)) { int position = ((PreviewMediaFragment) details).getPosition(); - boolean streaming = AccountUtils.getServerVersionForAccount(getAccount(), this) - .isMediaStreamingSupported(); - startMediaPreview(renamedFile, position, true, true, streaming); + startMediaPreview(renamedFile, position, true, true, true); } else { getFileOperationsHelper().openFile(renamedFile); } @@ -2342,11 +2338,9 @@ public void onMessageEvent(SyncEventFinished event) { if (event.getIntent().getBooleanExtra(TEXT_PREVIEW, false)) { startTextPreview((OCFile) bundle.get(EXTRA_FILE), true); } else if (bundle.containsKey(PreviewVideoActivity.EXTRA_START_POSITION)) { - boolean streaming = AccountUtils.getServerVersionForAccount(getAccount(), this) - .isMediaStreamingSupported(); - startMediaPreview((OCFile)bundle.get(EXTRA_FILE), - (int)bundle.get(PreviewVideoActivity.EXTRA_START_POSITION), - (boolean) bundle.get(PreviewVideoActivity.EXTRA_AUTOPLAY), true, streaming); + startMediaPreview((OCFile) bundle.get(EXTRA_FILE), + (int) bundle.get(PreviewVideoActivity.EXTRA_START_POSITION), + (boolean) bundle.get(PreviewVideoActivity.EXTRA_AUTOPLAY), true, true); } else if (bundle.containsKey(PreviewImageActivity.EXTRA_VIRTUAL_TYPE)) { startImagePreview((OCFile)bundle.get(EXTRA_FILE), (VirtualFolderType)bundle.get(PreviewImageActivity.EXTRA_VIRTUAL_TYPE), diff --git a/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java index fe6d73bf3ef1..30220c20955e 100644 --- a/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java +++ b/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java @@ -59,15 +59,12 @@ import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; -import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.resources.activities.model.Activity; import com.owncloud.android.lib.resources.activities.model.RichElement; import com.owncloud.android.lib.resources.activities.model.RichObject; import com.owncloud.android.lib.resources.activities.models.PreviewObject; -import com.owncloud.android.lib.resources.files.FileUtils; import com.owncloud.android.lib.resources.status.OCCapability; -import com.owncloud.android.lib.resources.status.OwnCloudVersion; import com.owncloud.android.ui.interfaces.ActivityListInterface; import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.MimeTypeUtil; @@ -230,23 +227,14 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi } }); - if (capability.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_15)) { - for (PreviewObject previewObject : activity.getPreviews()) { - if (!isDetailView || MimeTypeUtil.isImageOrVideo(previewObject.getMimeType()) || - MimeTypeUtil.isVideo(previewObject.getMimeType())) { - ImageView imageView = createThumbnailNew(previewObject, - activity - .getRichSubjectElement() - .getRichObjectList()); - activityViewHolder.list.addView(imageView); - } - } - } else { - for (RichObject richObject : activity.getRichSubjectElement().getRichObjectList()) { - if (richObject.getPath() != null) { - ImageView imageView = createThumbnailOld(richObject, isDetailView); - activityViewHolder.list.addView(imageView); - } + for (PreviewObject previewObject : activity.getPreviews()) { + if (!isDetailView || MimeTypeUtil.isImageOrVideo(previewObject.getMimeType()) || + MimeTypeUtil.isVideo(previewObject.getMimeType())) { + ImageView imageView = createThumbnailNew(previewObject, + activity + .getRichSubjectElement() + .getRichObjectList()); + activityViewHolder.list.addView(imageView); } } } else { @@ -301,68 +289,6 @@ private ImageView createThumbnailNew(PreviewObject previewObject, List activityListInterface.onActivityClicked(richObject)); - setBitmap(file, imageView, isDetailView); - - return imageView; - } - - private void setBitmap(OCFile file, ImageView fileIcon, boolean isDetailView) { - // No Folder - if (!file.isFolder()) { - if (MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file)) { - int placeholder; - - if (MimeTypeUtil.isImage(file)) { - placeholder = R.drawable.file_image; - } else { - placeholder = R.drawable.file_movie; - } - - String uri = client.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" + px + "/" + px + - Uri.encode(file.getRemotePath(), "/"); - - Glide.with(context).using(new CustomGlideStreamLoader(currentAccountProvider, clientFactory)) - .load(uri).placeholder(placeholder) - .error(placeholder) - .into(fileIcon); // using custom fetcher - - } else { - if (isDetailView) { - fileIcon.setVisibility(View.GONE); - } else { - fileIcon.setImageDrawable(MimeTypeUtil.getFileTypeIcon(file.getMimeType(), file.getFileName(), - context)); - } - } - } else { - // Folder - if (isDetailView) { - fileIcon.setVisibility(View.GONE); - } else { - fileIcon.setImageDrawable( - MimeTypeUtil.getFolderTypeIcon(file.isSharedWithMe() || file.isSharedWithSharee(), - file.isSharedViaLink(), file.isEncrypted(), file.getMountType(), context)); - } - } - } - private void downloadIcon(Activity activity, ImageView itemViewType) { GenericRequestBuilder requestBuilder = Glide.with(context) .using(Glide.buildStreamModelLoader(Uri.class, context), InputStream.class) diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java index 5fa7bb0c9f88..089194353270 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java @@ -55,7 +55,6 @@ import com.owncloud.android.lib.resources.files.ReadFileVersionsRemoteOperation; import com.owncloud.android.lib.resources.files.model.FileVersion; import com.owncloud.android.lib.resources.status.OCCapability; -import com.owncloud.android.lib.resources.status.OwnCloudVersion; import com.owncloud.android.operations.CommentFileOperation; import com.owncloud.android.ui.activity.ComponentsGetter; import com.owncloud.android.ui.adapter.ActivityAndVersionListAdapter; @@ -255,9 +254,7 @@ private void setupView() { operationsHelper = ((ComponentsGetter) requireActivity()).getFileOperationsHelper(); OCCapability capability = storageManager.getCapability(user.getAccountName()); - OwnCloudVersion serverVersion = user.getServer().getVersion(); - restoreFileVersionSupported = capability.getFilesVersioning().isTrue() && - serverVersion.compareTo(OwnCloudVersion.nextcloud_14) >= 0; + restoreFileVersionSupported = capability.getFilesVersioning().isTrue(); emptyContentProgressBar.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryAccentColor(getContext()), PorterDuff.Mode.SRC_IN); diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java index 583ae0ee7f37..6d69de90a40a 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -414,7 +414,7 @@ private void prepareOptionsMenu(Menu menu) { mf.filter(menu, true, - currentUser.getServer().getVersion().isMediaStreamingSupported()); + true); } if (getFile().isFolder()) { diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java index b33f12573a58..5e4d21754465 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java @@ -351,7 +351,7 @@ public void prepareUserOptionsMenu(Menu menu, OCShare share) { share.getExpirationDate(), getResources()); - sendNoteItem.setVisible(capabilities.getVersion().isNoteOnShareSupported()); + sendNoteItem.setVisible(true); } public void showLinkOverflowMenu(OCShare publicShare, ImageView overflowMenuShareLink) { @@ -399,8 +399,7 @@ public void prepareLinkOptionsMenu(Menu menu, OCShare publicShare) { Resources res = requireContext().getResources(); SharingMenuHelper.setupHideFileDownload(menu.findItem(R.id.action_hide_file_download), publicShare.isHideFileDownload(), - isFileDrop(publicShare), - capabilities); + isFileDrop(publicShare)); SharingMenuHelper.setupPasswordMenuItem(menu.findItem(R.id.action_password), publicShare.isPasswordProtected()); @@ -409,7 +408,7 @@ public void prepareLinkOptionsMenu(Menu menu, OCShare publicShare) { publicShare.getExpirationDate(), res); - menu.findItem(R.id.action_share_send_note).setVisible(capabilities.getVersion().isNoteOnShareSupported()); + menu.findItem(R.id.action_share_send_note).setVisible(true); } @VisibleForTesting diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java index 771f3be5162b..26b0deb83c4a 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -529,10 +529,9 @@ mContainerActivity, getActivity(), true, deviceInfo, accountManager.getUser()); - final boolean isMediaStreamingSupported = currentUser.getServer().getVersion().isMediaStreamingSupported(); mf.filter(popup.getMenu(), true, - isMediaStreamingSupported); + true); popup.setOnMenuItemClickListener(item -> { Set checkedFiles = new HashSet<>(); checkedFiles.add(file); @@ -694,10 +693,7 @@ public boolean onPrepareActionMode(ActionMode mode, Menu menu) { accountManager.getUser() ); - final boolean isMediaStreamingSupported = currentUser.getServer().getVersion().isMediaStreamingSupported(); - mf.filter(menu, - false, - isMediaStreamingSupported); + mf.filter(menu, false, true); // Determine if we need to finish the action mode because there are no items selected if (checkedCount == 0 && !mIsActionModeNew) { @@ -1021,8 +1017,7 @@ public void onItemClicked(OCFile file) { OCCapability capability = mContainerActivity.getStorageManager() .getCapability(account.getAccountName()); - if (PreviewMediaFragment.canBePreviewed(file) && account.getServer().getVersion() - .isMediaStreamingSupported() && !file.isEncrypted()) { + if (PreviewMediaFragment.canBePreviewed(file) && !file.isEncrypted()) { // stream media preview on >= NC14 setFabVisible(false); resetHeaderScrollingState(); diff --git a/src/main/java/com/owncloud/android/ui/fragment/util/SharingMenuHelper.java b/src/main/java/com/owncloud/android/ui/fragment/util/SharingMenuHelper.java index 9d53ccc52a2d..fe2cb51524f9 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/util/SharingMenuHelper.java +++ b/src/main/java/com/owncloud/android/ui/fragment/util/SharingMenuHelper.java @@ -25,7 +25,6 @@ import com.owncloud.android.R; import com.owncloud.android.lib.resources.shares.OCShare; -import com.owncloud.android.lib.resources.status.OCCapability; import java.text.SimpleDateFormat; import java.util.Date; @@ -66,14 +65,12 @@ public static void setupHideFileListingMenuItem(MenuItem fileListing, /** * Sets checked/visibility state on the given {@link MenuItem} based on the given criteria. * - * @param menuItem the {@link MenuItem} to be setup - * @param capabilities Capabilities of server to check if hide download is supported + * @param menuItem the {@link MenuItem} to be setup */ public static void setupHideFileDownload(MenuItem menuItem, boolean hideFileDownload, - boolean isFileDrop, - OCCapability capabilities) { - if (!capabilities.getVersion().isHideFileDownloadSupported() || isFileDrop) { + boolean isFileDrop) { + if (isFileDrop) { menuItem.setVisible(false); } else { menuItem.setVisible(true); diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java index eac7f1cf7fdf..73c74e9f6b50 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -385,7 +385,7 @@ public void onPrepareOptionsMenu(@NonNull Menu menu) { mf.filter(menu, true, - currentUser.getServer().getVersion().isMediaStreamingSupported()); + true); } // additional restriction for this fragment diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 18e9dd74fa79..97fa6829b8e0 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -356,9 +356,7 @@ public void onPrepareOptionsMenu(Menu menu) { currentUser ); - mf.filter(menu, - true, - currentUser.getServer().getVersion().isMediaStreamingSupported()); + mf.filter(menu, true, true); } // additional restriction for this fragment diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java index 5f0aaed10cae..4c674986dfaa 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java @@ -270,9 +270,7 @@ public void onPrepareOptionsMenu(@NonNull Menu menu) { deviceInfo, user ); - mf.filter(menu, - true, - user.getServer().getVersion().isMediaStreamingSupported()); + mf.filter(menu, true, true); } // additional restriction for this fragment diff --git a/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java b/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java index 5a664f53dba1..3aed975cbf85 100644 --- a/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java +++ b/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java @@ -29,9 +29,7 @@ import com.nextcloud.client.account.User; import com.owncloud.android.R; import com.owncloud.android.lib.resources.status.OCCapability; -import com.owncloud.android.lib.resources.status.OwnCloudVersion; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; /** @@ -61,9 +59,8 @@ public static void filterSearchMenuItems(Menu menu, } } - public static void filterTrashbinMenuItem(Menu menu, @NonNull User user, @Nullable OCCapability capability) { - if (user.getServer().getVersion().compareTo(OwnCloudVersion.nextcloud_14) < 0 || - capability != null && capability.getFilesUndelete().isFalse() || + public static void filterTrashbinMenuItem(Menu menu, @Nullable OCCapability capability) { + if (capability != null && capability.getFilesUndelete().isFalse() || capability != null && capability.getFilesUndelete().isUnknown()) { filterMenuItems(menu, R.id.nav_trashbin); } diff --git a/src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt b/src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt index 0808e892c694..d597ab14fc51 100644 --- a/src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt +++ b/src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt @@ -93,8 +93,8 @@ class ConnectivityServiceTest { lateinit var logger: Logger val baseServerUri = URI.create(SERVER_BASE_URL) - val newServer = Server(baseServerUri, OwnCloudVersion.nextcloud_14) - val legacyServer = Server(baseServerUri, OwnCloudVersion.nextcloud_13) + val newServer = Server(baseServerUri, OwnCloudVersion.nextcloud_20) + val legacyServer = Server(baseServerUri, OwnCloudVersion.nextcloud_16) @Mock lateinit var user: User @@ -207,12 +207,6 @@ class ConnectivityServiceTest { whenever(getRequest.responseBodyAsString).thenReturn(body) } - @Test - fun `false maintenance status flag is used`() { - mockResponse(maintenance = false, httpStatus = HttpStatus.SC_OK) - assertFalse(connectivityService.isInternetWalled) - } - @Test fun `true maintenance status flag is used`() { mockResponse(maintenance = true, httpStatus = HttpStatus.SC_OK) @@ -231,7 +225,7 @@ class ConnectivityServiceTest { connectivityService.isInternetWalled val urlCaptor = ArgumentCaptor.forClass(String::class.java) verify(requestBuilder).invoke(urlCaptor.capture()) - assertTrue("Invalid URL used to check status", urlCaptor.value.endsWith("/status.php")) + assertTrue("Invalid URL used to check status", urlCaptor.value.endsWith("/204")) } } @@ -241,7 +235,7 @@ class ConnectivityServiceTest { fun setUp() { whenever(networkInfo.isConnectedOrConnecting).thenReturn(true) whenever(networkInfo.type).thenReturn(ConnectivityManager.TYPE_WIFI) - whenever(accountManager.getServerVersion(any())).thenReturn(OwnCloudVersion.nextcloud_14) + whenever(accountManager.getServerVersion(any())).thenReturn(OwnCloudVersion.nextcloud_20) assertTrue( "Precondition failed", connectivityService.connectivity.let { @@ -255,7 +249,7 @@ class ConnectivityServiceTest { // GIVEN // network connectivity is present // user has no server URI (empty) - val serverWithoutUri = Server(URI(""), OwnCloudVersion.nextcloud_14) + val serverWithoutUri = Server(URI(""), OwnCloudVersion.nextcloud_20) whenever(user.server).thenReturn(serverWithoutUri) // WHEN