From 4fa2401b27286152414dd391069ede9a2f60a85a Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 18 Aug 2019 13:22:41 +0200 Subject: [PATCH] Removed CustomContentProvider.openFile() as it was used for Google Earth integration. --- .../content/CustomContentProvider.java | 24 ------------------- .../dennisguse/opentracks/util/FileUtils.java | 5 +--- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java b/src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java index ad607f9b4..792927554 100644 --- a/src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java +++ b/src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java @@ -20,7 +20,6 @@ import android.content.ContentProvider; import android.content.ContentUris; import android.content.ContentValues; import android.content.Context; -import android.content.Intent; import android.content.UriMatcher; import android.database.Cursor; import android.database.SQLException; @@ -29,18 +28,12 @@ import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteQueryBuilder; import android.net.Uri; -import android.os.ParcelFileDescriptor; import android.text.TextUtils; import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; -import de.dennisguse.opentracks.util.FileUtils; - -import java.io.File; -import java.io.FileNotFoundException; - /** * A {@link ContentProvider} that handles access to track points, tracks, and * waypoints tables. @@ -277,23 +270,6 @@ public class CustomContentProvider extends ContentProvider { return count; } - @Override - public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException { - try { - File file = new File(uri.getPath()); - if (file.exists()) { - return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY); - } - throw new FileNotFoundException(uri.getPath()); - } finally { - File dir = new File(getContext().getCacheDir(), FileUtils.PLAY_TRACKS_DIR); - for (File file : dir.listFiles()) { - file.delete(); - } - getContext().revokeUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION); - } - } - /** * Gets the {@link UrlType} for a url. * diff --git a/src/main/java/de/dennisguse/opentracks/util/FileUtils.java b/src/main/java/de/dennisguse/opentracks/util/FileUtils.java index 54a27c4f5..69e08be60 100644 --- a/src/main/java/de/dennisguse/opentracks/util/FileUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/FileUtils.java @@ -35,10 +35,7 @@ public class FileUtils { * Used to transfer picture from the camera. */ public static final String FILEPROVIDER = BuildConfig.APPLICATION_ID + ".fileprovider"; - /** - * The play tracks directory in the app's cache directory. - */ - public static final String PLAY_TRACKS_DIR = "temp"; + /** * Our external storage directory. */