demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Set mimeType when sharing files

Browse Source
This commit is contained in:
José Rebelo
2026-05-15 23:09:10 +01:00
parent bb97a90909
commit 5ffd6b6074
3 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/files/FileManagerAdapter.java
+11 -2
View File
@@ -21,6 +21,7 @@ import android.content.Intent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.webkit.MimeTypeMap;
import android.widget.Filter; import android.widget.Filter;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.PopupMenu; import android.widget.PopupMenu;
@@ -111,8 +112,16 @@ public class FileManagerAdapter extends RecyclerView.Adapter<FileManagerAdapter.
final int itemId = item.getItemId(); final int itemId = item.getItemId();
if (itemId == R.id.file_manager_file_menu_share) { if (itemId == R.id.file_manager_file_menu_share) {
try { try {
AndroidUtils.shareFile(mContext, file, "*/*"); String mimeType = null;
} catch (final IOException e) { final String extension = MimeTypeMap.getFileExtensionFromUrl(file.getPath());
if (extension != null) {
mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
}
if (mimeType == null) {
mimeType = "*/*";
}
AndroidUtils.shareFile(mContext, file, mimeType);
} catch (final Exception e) {
GB.toast("Failed to share file", Toast.LENGTH_LONG, GB.ERROR, e); GB.toast("Failed to share file", Toast.LENGTH_LONG, GB.ERROR, e);
} }
return true; return true;
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/WorkoutDetailsFragment.kt
+10 -4
View File
@@ -720,7 +720,7 @@ class WorkoutDetailsFragment : Fragment(), MenuProvider {
} }
try { try {
AndroidUtils.shareFile(requireContext(), gpxFile) AndroidUtils.shareFile(requireContext(), gpxFile, "application/gpx+xml")
} catch (e: Exception) { } catch (e: Exception) {
GB.toast( GB.toast(
requireContext(), requireContext(),
@@ -742,7 +742,12 @@ class WorkoutDetailsFragment : Fragment(), MenuProvider {
FileUtils.makeValidFileName("${DateTimeUtils.formatIso8601(workout.summary.startTime)}_summary.bin") FileUtils.makeValidFileName("${DateTimeUtils.formatIso8601(workout.summary.startTime)}_summary.bin")
try { try {
AndroidUtils.shareBytesAsFile(requireContext(), filename, workout.summary.rawSummaryData) AndroidUtils.shareBytesAsFile(
requireContext(),
filename,
workout.summary.rawSummaryData,
"application/octet-stream"
)
} catch (e: Exception) { } catch (e: Exception) {
GB.toast( GB.toast(
requireContext(), requireContext(),
@@ -766,7 +771,7 @@ class WorkoutDetailsFragment : Fragment(), MenuProvider {
} }
try { try {
AndroidUtils.shareFile(requireContext(), file) AndroidUtils.shareFile(requireContext(), file, "application/octet-stream")
} catch (e: Exception) { } catch (e: Exception) {
GB.toast( GB.toast(
requireContext(), requireContext(),
@@ -785,7 +790,8 @@ class WorkoutDetailsFragment : Fragment(), MenuProvider {
AndroidUtils.shareBytesAsFile( AndroidUtils.shareBytesAsFile(
requireContext(), requireContext(),
filename, filename,
workout.data.toString().toByteArray(StandardCharsets.UTF_8) workout.data.toString().toByteArray(StandardCharsets.UTF_8),
"application/json"
) )
} catch (e: Exception) { } catch (e: Exception) {
GB.toast( GB.toast(
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java
+6 -7
View File
@@ -286,7 +286,10 @@ public class AndroidUtils {
} }
} }
public static void shareBytesAsFile(final Context context, final String name, final byte[] bytes) throws IOException { public static void shareBytesAsFile(final Context context,
final String name,
final byte[] bytes,
final String type) throws IOException {
final File cacheDir = context.getCacheDir(); final File cacheDir = context.getCacheDir();
final File rawCacheDir = new File(cacheDir, "raw"); final File rawCacheDir = new File(cacheDir, "raw");
rawCacheDir.mkdir(); rawCacheDir.mkdir();
@@ -299,19 +302,15 @@ public class AndroidUtils {
return; return;
} }
shareFile(context, file); shareFile(context, file, type);
} }
public static void shareFile(final Context context, final File file) throws IOException { public static void shareFile(final Context context, final File file, final String type) throws IOException {
if (!file.exists()) { if (!file.exists()) {
LOG.warn("File {} does not exist", file.getPath()); LOG.warn("File {} does not exist", file.getPath());
return; return;
} }
shareFile(context, file, "*/*");
}
public static void shareFile(final Context context, final File file, final String type) throws IOException {
final Uri contentUri = FileProvider.getUriForFile( final Uri contentUri = FileProvider.getUriForFile(
context, context,
context.getApplicationContext().getPackageName() + ".screenshot_provider", context.getApplicationContext().getPackageName() + ".screenshot_provider",