Pictures: removed MediaScanner.

This commit is contained in:
Dennis Guse
2020-01-01 14:44:23 +01:00
parent 441d3f721f
commit c6d24e9534
4 changed files with 0 additions and 21 deletions
@@ -53,7 +53,6 @@ import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
import de.dennisguse.opentracks.fragments.StatsFragment; import de.dennisguse.opentracks.fragments.StatsFragment;
import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
import de.dennisguse.opentracks.settings.SettingsActivity; import de.dennisguse.opentracks.settings.SettingsActivity;
import de.dennisguse.opentracks.util.FileUtils;
import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.IntentUtils;
import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.util.PreferencesUtils;
import de.dennisguse.opentracks.util.TrackIconUtils; import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -108,10 +107,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
if (hasPhoto && photoUri != null) { if (hasPhoto && photoUri != null) {
hasPhoto = false; hasPhoto = false;
long markerId = trackRecordingServiceConnection.addMarker(TrackDetailActivity.this, null, null, null, photoUri.toString()); long markerId = trackRecordingServiceConnection.addMarker(TrackDetailActivity.this, null, null, null, photoUri.toString());
if (markerId != -1L) {
//TODO: Make configurable.
FileUtils.updateMediaScanner(TrackDetailActivity.this, photoUri);
}
} }
} }
}); });
@@ -229,13 +229,11 @@ public class ContentProviderUtils {
* @param dir the directory * @param dir the directory
*/ */
private void deleteDirectoryRecurse(Context context, File dir) { private void deleteDirectoryRecurse(Context context, File dir) {
// TODO Does not work with
if (dir.exists() && dir.isDirectory()) { if (dir.exists() && dir.isDirectory()) {
for (File child : dir.listFiles()) { for (File child : dir.listFiles()) {
deleteDirectoryRecurse(context, child); deleteDirectoryRecurse(context, child);
} }
dir.delete(); dir.delete();
FileUtils.updateMediaScanner(context, Uri.fromFile(dir));
} }
} }
@@ -458,7 +456,6 @@ public class ContentProviderUtils {
if (file.exists()) { if (file.exists()) {
File parent = file.getParentFile(); File parent = file.getParentFile();
file.delete(); file.delete();
FileUtils.updateMediaScanner(context, uri);
if (parent.listFiles().length == 0) { if (parent.listFiles().length == 0) {
parent.delete(); parent.delete();
} }
@@ -17,7 +17,6 @@
package de.dennisguse.opentracks.io.file.importer; package de.dennisguse.opentracks.io.file.importer;
import android.content.Context; import android.content.Context;
import android.net.Uri;
import android.util.Log; import android.util.Log;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@@ -113,7 +112,6 @@ public class KmzTrackImporter implements TrackImporter {
file.delete(); file.delete();
} }
dir.delete(); dir.delete();
FileUtils.updateMediaScanner(context, Uri.fromFile(dir));
} }
} }
} }
@@ -168,8 +166,6 @@ public class KmzTrackImporter implements TrackImporter {
while ((count = zipInputStream.read(buffer)) != -1) { while ((count = zipInputStream.read(buffer)) != -1) {
fileOutputStream.write(buffer, 0, count); fileOutputStream.write(buffer, 0, count);
} }
FileUtils.updateMediaScanner(context, Uri.fromFile(file));
} }
} }
} }
@@ -16,8 +16,6 @@
package de.dennisguse.opentracks.util; package de.dennisguse.opentracks.util;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Environment; import android.os.Environment;
import androidx.documentfile.provider.DocumentFile; import androidx.documentfile.provider.DocumentFile;
@@ -109,13 +107,6 @@ public class FileUtils {
return fileName.substring(index + 1); return fileName.substring(index + 1);
} }
// TODO Make user configurable!
public static void updateMediaScanner(Context context, Uri uri) {
Intent mediaScanIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
mediaScanIntent.setData(uri);
context.sendBroadcast(mediaScanIntent);
}
/** /**
* Builds a filename with the given base and the given extension, possibly adding a suffix to ensure the file doesn't exist. * Builds a filename with the given base and the given extension, possibly adding a suffix to ensure the file doesn't exist.
* *