Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop Android 7.0 support #14448

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −18
Open

drop Android 7.0 support #14448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd07360
drop Android 7.0 support
tobiasKaminsky Jan 22, 2025
25ea3c6
Bump version
ZetaTom Jan 22, 2025
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/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ android {

defaultConfig {
applicationId "com.nextcloud.client"
minSdkVersion 24
minSdkVersion 25
targetSdkVersion 35
compileSdk 35

Expand Down
13 changes: 3 additions & 10 deletions app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
import com.owncloud.android.utils.FileSortOrder;
import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.utils.MimeTypeUtil;
import com.owncloud.android.utils.theme.CapabilityUtils;
import com.owncloud.android.utils.theme.ViewThemeUtils;

import java.io.File;
Expand Down Expand Up @@ -194,10 +193,7 @@ public OCFileListAdapter(
gridView,
transferServiceGetter,
true,
CapabilityUtils
.getCapability(activity)
.getVersion()
.isShareesOnDavSupported(),
true,
viewThemeUtils,
syncedFolderProvider);

Expand Down Expand Up @@ -835,7 +831,7 @@ public void swapDirectory(

if (!updatedStorageManager.equals(mStorageManager)) {
mStorageManager = updatedStorageManager;
ocFileListDelegate.setShowShareAvatar(CapabilityUtils.getCapability(account, activity).getVersion().isShareesOnDavSupported());
ocFileListDelegate.setShowShareAvatar(true);
this.user = account;
}
if (mStorageManager != null) {
Expand Down Expand Up @@ -913,10 +909,7 @@ public void setData(List<Object> objects,
boolean clear) {
if (storageManager != null && mStorageManager == null) {
mStorageManager = storageManager;
ocFileListDelegate.setShowShareAvatar(mStorageManager
.getCapability(user.getAccountName())
.getVersion()
.isShareesOnDavSupported());
ocFileListDelegate.setShowShareAvatar(true);
}


Expand Down
7 changes: 1 addition & 6 deletions app/src/main/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ package com.owncloud.android.ui.dialog

import android.app.Dialog
import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.os.storage.StorageManager
import androidx.annotation.RequiresApi
import com.nextcloud.utils.extensions.getParcelableArgument
import com.owncloud.android.R
import com.owncloud.android.datamodel.OCFile
Expand Down Expand Up @@ -57,7 +55,6 @@ class SyncFileNotEnoughSpaceDialogFragment :
/**
* Will access to storage manager in order to empty useless files
*/
@RequiresApi(api = Build.VERSION_CODES.N_MR1)
override fun onCancel(callerTag: String?) {
val storageIntent = Intent(StorageManager.ACTION_MANAGE_STORAGE)
startActivityForResult(storageIntent, REQUEST_CODE_STORAGE)
Expand Down Expand Up @@ -91,9 +88,7 @@ class SyncFileNotEnoughSpaceDialogFragment :
if (file.isFolder) {
args.putInt(ARG_POSITIVE_BTN_RES, R.string.sync_not_enough_space_dialog_action_choose)
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
args.putInt(ARG_NEGATIVE_BTN_RES, R.string.sync_not_enough_space_dialog_action_free_space)
}
args.putInt(ARG_NEGATIVE_BTN_RES, R.string.sync_not_enough_space_dialog_action_free_space)
args.putInt(ARG_NEUTRAL_BTN_RES, R.string.common_cancel)

frag.arguments = args
Expand Down
2 changes: 1 addition & 1 deletion appscan/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ android {
namespace 'com.nextcloud.appscan'

defaultConfig {
minSdk 24
minSdk 25
targetSdk 35
compileSdk 35

Expand Down
Loading