Remove usage of external cache

pull/3104/head
Alex Baker 1 year ago
parent 31afc842bd
commit c7d10f69e7

@ -13,8 +13,6 @@ import androidx.lifecycle.ProcessLifecycleOwner
import androidx.lifecycle.coroutineScope import androidx.lifecycle.coroutineScope
import androidx.work.Configuration import androidx.work.Configuration
import com.mikepenz.iconics.Iconics import com.mikepenz.iconics.Iconics
import org.tasks.icons.OutlinedGoogleMaterial
import org.tasks.icons.OutlinedGoogleMaterial2
import com.todoroo.astrid.service.Upgrader import com.todoroo.astrid.service.Upgrader
import dagger.Lazy import dagger.Lazy
import dagger.hilt.android.HiltAndroidApp import dagger.hilt.android.HiltAndroidApp
@ -24,7 +22,8 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.tasks.billing.Inventory import org.tasks.billing.Inventory
import org.tasks.caldav.CaldavSynchronizer import org.tasks.caldav.CaldavSynchronizer
import org.tasks.files.FileHelper import org.tasks.icons.OutlinedGoogleMaterial
import org.tasks.icons.OutlinedGoogleMaterial2
import org.tasks.injection.InjectingJobIntentService import org.tasks.injection.InjectingJobIntentService
import org.tasks.jobs.WorkManager import org.tasks.jobs.WorkManager
import org.tasks.location.GeofenceApi import org.tasks.location.GeofenceApi
@ -108,7 +107,6 @@ class Tasks : Application(), Configuration.Provider {
} }
OpenTaskContentObserver.registerObserver(context, contentObserver.get()) OpenTaskContentObserver.registerObserver(context, contentObserver.get())
geofenceApi.get().registerAll() geofenceApi.get().registerAll()
FileHelper.delete(context, preferences.cacheDirectory)
appWidgetManager.get().reconfigureWidgets() appWidgetManager.get().reconfigureWidgets()
CaldavSynchronizer.registerFactories() CaldavSynchronizer.registerFactories()
} }

@ -13,22 +13,15 @@ import androidx.core.content.FileProvider;
import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Constants;
import org.tasks.files.FileHelper; import org.tasks.files.FileHelper;
import org.tasks.preferences.Preferences;
import org.tasks.time.DateTime; import org.tasks.time.DateTime;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
@AndroidEntryPoint
public class CameraActivity extends AppCompatActivity { public class CameraActivity extends AppCompatActivity {
private static final int REQUEST_CODE_CAMERA = 75; private static final int REQUEST_CODE_CAMERA = 75;
private static final String EXTRA_URI = "extra_output"; private static final String EXTRA_URI = "extra_output";
@Inject Preferences preferences;
private Uri uri; private Uri uri;
@ -44,7 +37,7 @@ public class CameraActivity extends AppCompatActivity {
uri = uri =
FileHelper.newFile( FileHelper.newFile(
this, this,
preferences.getCacheDirectory(), Uri.fromFile(getCacheDir()),
"image/jpeg", "image/jpeg",
new DateTime().toString("yyyyMMddHHmm"), new DateTime().toString("yyyyMMddHHmm"),
".jpeg"); ".jpeg");

@ -144,7 +144,7 @@ object FileHelper {
val mimeType = getMimeType(context, uri) val mimeType = getMimeType(context, uri)
val intent = Intent(Intent.ACTION_VIEW) val intent = Intent(Intent.ACTION_VIEW)
if (uri.scheme == ContentResolver.SCHEME_CONTENT) { if (uri.scheme == ContentResolver.SCHEME_CONTENT) {
uri = copyToUri(context, Uri.fromFile(context.externalCacheDir), uri) uri = copyToUri(context, Uri.fromFile(context.cacheDir), uri)
} }
val share = FileProvider.getUriForFile(context, Constants.FILE_PROVIDER_AUTHORITY, File(uri.path)) val share = FileProvider.getUriForFile(context, Constants.FILE_PROVIDER_AUTHORITY, File(uri.path))
intent.setDataAndType(share, mimeType) intent.setDataAndType(share, mimeType)

@ -430,15 +430,6 @@ class Preferences @JvmOverloads constructor(
return if (file.isDirectory || file.mkdirs()) file else null return if (file.isDirectory || file.mkdirs()) file else null
} }
val cacheDirectory: Uri
get() {
var cacheDir = context.externalCacheDir
if (cacheDir == null) {
cacheDir = context.cacheDir
}
return DocumentFile.fromFile(cacheDir!!).uri
}
private fun hasWritePermission(context: Context, uri: Uri): Boolean = private fun hasWritePermission(context: Context, uri: Uri): Boolean =
(PackageManager.PERMISSION_GRANTED (PackageManager.PERMISSION_GRANTED
== context.checkUriPermission( == context.checkUriPermission(

@ -3,9 +3,6 @@
<external-path <external-path
name="external" name="external"
path="." /> path="." />
<external-cache-path
name="external_cache"
path="." />
<cache-path <cache-path
name="internal_cache" name="internal_cache"
path="." /> path="." />

Loading…
Cancel
Save