From 051423cf219306ae4ef29cf963893fbf7e43f6ab Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 6 Jan 2020 15:48:12 +0100 Subject: [PATCH] remove support for NC12 Signed-off-by: tobiasKaminsky --- .../client/account/UserAccountManager.java | 3 --- .../client/account/UserAccountManagerImpl.java | 5 ----- src/main/java/com/owncloud/android/MainApp.java | 4 ++-- .../authentication/AuthenticatorActivity.java | 2 +- .../android/ui/activity/DrawerActivity.java | 4 +--- .../android/ui/fragment/ExtendedListFragment.java | 13 ++++--------- 6 files changed, 8 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/nextcloud/client/account/UserAccountManager.java b/src/main/java/com/nextcloud/client/account/UserAccountManager.java index d4394423a564..cf4acc4d8578 100644 --- a/src/main/java/com/nextcloud/client/account/UserAccountManager.java +++ b/src/main/java/com/nextcloud/client/account/UserAccountManager.java @@ -101,9 +101,6 @@ public interface UserAccountManager extends CurrentAccountProvider { @NonNull OwnCloudVersion getServerVersion(Account account); - @Deprecated - boolean isSearchSupported(@Nullable Account account); - /** * Check if user's account supports media streaming. This is a property of server where user has his account. * diff --git a/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java b/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java index 25f16b02f75d..b292b3bc510a 100644 --- a/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java +++ b/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java @@ -306,11 +306,6 @@ public OwnCloudVersion getServerVersion(Account account) { return serverVersion; } - @Override - public boolean isSearchSupported(Account account) { - return account != null && getServerVersion(account).isSearchSupported(); - } - @Override public boolean isMediaStreamingSupported(Account account) { return account != null && getServerVersion(account).isMediaStreamingSupported(); diff --git a/src/main/java/com/owncloud/android/MainApp.java b/src/main/java/com/owncloud/android/MainApp.java index b78d6ef6283c..5acc9ea4580d 100644 --- a/src/main/java/com/owncloud/android/MainApp.java +++ b/src/main/java/com/owncloud/android/MainApp.java @@ -122,8 +122,8 @@ */ public class MainApp extends MultiDexApplication implements HasAndroidInjector { - public static final OwnCloudVersion OUTDATED_SERVER_VERSION = OwnCloudVersion.nextcloud_13; - public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_12; + public static final OwnCloudVersion OUTDATED_SERVER_VERSION = OwnCloudVersion.nextcloud_15; + public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_13; private static final String TAG = MainApp.class.getSimpleName(); public static final String DOT = "."; diff --git a/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java index f3b6e5fda95f..0e4d5f7a8778 100644 --- a/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -1307,7 +1307,7 @@ private void onGetServerInfoFinish(RemoteOperationResult result) { DisplayUtils.showServerOutdatedSnackbar(this, Snackbar.LENGTH_INDEFINITE); } - webViewLoginMethod = mServerInfo.mVersion.isWebLoginSupported() && !forceOldLoginMethod; + webViewLoginMethod = !forceOldLoginMethod; if (webViewUser != null && !webViewUser.isEmpty() && webViewPassword != null && !webViewPassword.isEmpty()) { 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 98e524863fcc..e762c0d4a23f 100644 --- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -371,9 +371,7 @@ private void filterDrawerMenu(final Menu menu, @NonNull final User user) { getContentResolver()); OCCapability capability = storageManager.getCapability(user.getAccountName()); - boolean hasSearchSupport = user.getServer().getVersion().isSearchSupported(); - - DrawerMenuUtil.filterSearchMenuItems(menu, user.toPlatformAccount(), getResources(), hasSearchSupport); + DrawerMenuUtil.filterSearchMenuItems(menu, user.toPlatformAccount(), getResources(), true); DrawerMenuUtil.filterTrashbinMenuItem(menu, user.toPlatformAccount(), capability, accountManager); DrawerMenuUtil.filterActivityMenuItem(menu, capability); diff --git a/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java index cb7a23a50ce7..bbc59405c5d6 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java @@ -53,7 +53,6 @@ import android.widget.TextView; import com.google.android.material.floatingactionbutton.FloatingActionButton; -import com.nextcloud.client.account.User; import com.nextcloud.client.account.UserAccountManager; import com.nextcloud.client.di.Injectable; import com.nextcloud.client.preferences.AppPreferences; @@ -305,14 +304,10 @@ private void performSearch(final String query, boolean isSubmit) { handler.postDelayed(new Runnable() { @Override public void run() { - User user = accountManager.getUser(); - if (user.getServer().getVersion().isSearchSupported()) { - EventBus.getDefault().post(new SearchEvent(query, - SearchRemoteOperation.SearchType.FILE_SEARCH, SearchEvent.UnsetType.NO_UNSET)); - } else { - OCFileListAdapter fileListListAdapter = (OCFileListAdapter) adapter; - fileListListAdapter.getFilter().filter(query); - } + EventBus.getDefault().post(new SearchEvent(query, + SearchRemoteOperation.SearchType.FILE_SEARCH, + SearchEvent.UnsetType.NO_UNSET)); + } }, delay); } else if (adapter instanceof LocalFileListAdapter) {