Skip to content

Commit

Permalink
Merge pull request #12052 from nextcloud/feature/use-m3-file-download…
Browse files Browse the repository at this point in the history
…er-notification

Use Material Design 3 File Downloader Notification
  • Loading branch information
AndyScherzinger committed Oct 30, 2023
2 parents c52bad8 + 9d1ac6b commit 3d5ee8a
Show file tree
Hide file tree
Showing 6 changed files with 746 additions and 751 deletions.
13 changes: 7 additions & 6 deletions app/src/main/java/com/owncloud/android/datamodel/OCFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,11 @@

import android.content.ContentResolver;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;

import com.nextcloud.android.common.ui.theme.utils.ColorRole;
import com.owncloud.android.R;
import com.owncloud.android.lib.common.network.WebdavEntry;
import com.owncloud.android.lib.common.network.WebdavUtils;
Expand All @@ -41,9 +38,7 @@
import com.owncloud.android.lib.resources.files.model.ImageDimension;
import com.owncloud.android.lib.resources.files.model.ServerFileInterface;
import com.owncloud.android.lib.resources.shares.ShareeUser;
import com.owncloud.android.utils.DrawableUtil;
import com.owncloud.android.utils.MimeType;
import com.owncloud.android.utils.theme.ViewThemeUtils;

import java.io.File;
import java.util.ArrayList;
Expand All @@ -52,7 +47,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.core.content.ContextCompat;
import androidx.core.content.FileProvider;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import third_parties.daveKoeller.AlphanumComparator;
Expand Down Expand Up @@ -350,6 +344,13 @@ public boolean existsOnDevice() {
return false;
}

public String getFileNameWithExtension(int fileNameLength) {
String fileName = getFileName();
String shortFileName = fileName.substring(0, Math.min(fileName.length(), fileNameLength));
String extension = "." + fileName.substring(fileName.lastIndexOf('.') + 1);
return shortFileName + extension;
}

/**
* The path, where the file is stored locally
*
Expand Down
Loading

0 comments on commit 3d5ee8a

Please sign in to comment.