export alarms

forrestguice · May 11, 2022 · d97be8f · d97be8f
1 parent f2bf3fc
commit d97be8f
Showing 1 changed file with 22 additions and 18 deletions.
diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/alarmclock/ui/AlarmListDialog.java b/app/src/main/java/com/forrestguice/suntimeswidget/alarmclock/ui/AlarmListDialog.java
@@ -561,30 +561,34 @@ public void onFinished(AlarmClockItemExportTask.ExportResult results)
             exportTask = null;
             showProgress(false);
 
-            File file = results.getExportFile();
-            String path = ((file != null) ? file.getAbsolutePath() : results.getExportUri().toString());
-
-            if (results.getResult())
+            Context context = getActivity();
+            if (context != null)
             {
-                if (isAdded()) {
-                    String successMessage = getString(R.string.msg_export_success, path);
-                    Toast.makeText(getActivity(), successMessage, Toast.LENGTH_LONG).show();
-                    // TODO: use a snackbar instead; offer 'copy path' action
-                }
+                File file = results.getExportFile();
+                String path = ((file != null) ? file.getAbsolutePath() : ExportTask.getFileName(getContext().getContentResolver(), results.getExportUri()));
+
+                if (results.getResult())
+                {
+                    if (isAdded()) {
+                        String successMessage = getString(R.string.msg_export_success, path);
+                        Toast.makeText(getActivity(), successMessage, Toast.LENGTH_LONG).show();
+                        // TODO: use a snackbar instead; offer 'copy path' action
+                    }
 
-                if (Build.VERSION.SDK_INT >= 19) {
-                    if (results.getExportUri() == null) {
+                    if (Build.VERSION.SDK_INT >= 19) {
+                        if (results.getExportUri() == null) {
+                            ExportTask.shareResult(getActivity(), results.getExportFile(), results.getMimeType());
+                        }
+                    } else {
                         ExportTask.shareResult(getActivity(), results.getExportFile(), results.getMimeType());
                     }
-                } else {
-                    ExportTask.shareResult(getActivity(), results.getExportFile(), results.getMimeType());
+                    return;
                 }
-                return;
-            }
 
-            if (isAdded()) {
-                String failureMessage = getString(R.string.msg_export_failure, path);
-                Toast.makeText(getActivity(), failureMessage, Toast.LENGTH_LONG).show();
+                if (isAdded()) {
+                    String failureMessage = getString(R.string.msg_export_failure, path);
+                    Toast.makeText(getActivity(), failureMessage, Toast.LENGTH_LONG).show();
+                }
             }
         }
     };