Merge pull request #5102 from nextcloud/removeNC12

remove support for NC12

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.
      *

src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java

@@ -306,11 +306,6 @@ public class UserAccountManagerImpl implements UserAccountManager {
         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();

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

@@ -122,8 +122,8 @@ import static com.owncloud.android.ui.activity.ContactsPreferenceActivity.PREFER
  */
 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 = ".";

src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -1307,7 +1307,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 DisplayUtils.showServerOutdatedSnackbar(this, Snackbar.LENGTH_INDEFINITE);
             }
 
-            webViewLoginMethod = mServerInfo.mVersion.isWebLoginSupported() && !forceOldLoginMethod;
+            webViewLoginMethod = !forceOldLoginMethod;
 
             if (webViewUser != null && !webViewUser.isEmpty() &&
                     webViewPassword != null && !webViewPassword.isEmpty()) {

src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -371,9 +371,7 @@ public abstract class DrawerActivity extends ToolbarActivity
                                                                                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);
 

src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -53,7 +53,6 @@ import android.widget.ProgressBar;
 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 @@ public class ExtendedListFragment extends Fragment implements
                 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) {