Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/MainApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
*/
public class MainApp extends Application implements HasAndroidInjector, NetworkChangeListener {
public static final OwnCloudVersion OUTDATED_SERVER_VERSION = NextcloudVersion.nextcloud_30;
public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_20;
public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = NextcloudVersion.nextcloud_23;

private static final String TAG = MainApp.class.getSimpleName();
public static final String DOT = ".";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,14 @@ import com.owncloud.android.MainApp
import com.owncloud.android.R
import com.owncloud.android.databinding.ListFragmentBinding
import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.lib.resources.files.SearchRemoteOperation
import com.owncloud.android.lib.resources.status.OwnCloudVersion
import com.owncloud.android.ui.EmptyRecyclerView
import com.owncloud.android.ui.activity.FileDisplayActivity
import com.owncloud.android.ui.activity.FolderPickerActivity
import com.owncloud.android.ui.activity.OnEnforceableRefreshListener
import com.owncloud.android.ui.activity.UploadFilesActivity
import com.owncloud.android.ui.adapter.localFileList.LocalFileListAdapter
import com.owncloud.android.ui.adapter.filelist.OCFileListAdapter
import com.owncloud.android.ui.events.SearchEvent
import com.owncloud.android.utils.theme.ViewThemeUtils
import org.greenrobot.eventbus.EventBus
import javax.inject.Inject
import kotlin.math.max
import kotlin.math.min
Expand Down Expand Up @@ -260,18 +256,7 @@ open class ExtendedListFragment :
} else {
Handler(Looper.getMainLooper()).post {
if (adapter is OCFileListAdapter) {
if (accountManager
.user
.server
.version
.isNewerOrEqual(OwnCloudVersion.nextcloud_20)
) {
activity.performUnifiedSearch(query, listOfHiddenFiles)
} else {
EventBus.getDefault().post(
SearchEvent(query, SearchRemoteOperation.SearchType.FILE_SEARCH)
)
}
activity.performUnifiedSearch(query, listOfHiddenFiles)
} else if (adapter is LocalFileListAdapter) {
adapter.filter(query)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult
import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.lib.resources.shares.OCShare
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.operations.RefreshFolderOperation
import com.owncloud.android.providers.UsersAndGroupsSearchConfig
Expand Down Expand Up @@ -805,10 +804,6 @@ class FileDetailSharingFragment :
}

override fun showProfileBottomSheet(user: User, shareWith: String?) {
if (!user.server.version.isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
return
}

val userId = shareWith ?: return
val activity = fileActivity ?: return

Expand Down
Loading