Show response handling errors

Author: tsudoko

app/src/main/java/re/flande/xshare/UploadFile.kt

@@ -80,15 +80,21 @@ fun uploadFile(context: Context, uploader: Uploader, file: Uri) {
                     nBuilder.setContentText(context.resources.getString(R.string.upload_failed))
                             .setStyle(Notification.BigTextStyle().bigText(err.toString()))
                 } else {
-                    val url = uploader.prepareUrl(d)
-                    val i = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-                    val intent = PendingIntent.getActivity(context, 0, i, 0)
-                    nBuilder.setContentText(url)
-                            .setStyle(Notification.BigTextStyle().bigText(url))
-                            .setContentIntent(intent)
+                    try {
+                        val url = uploader.prepareUrl(d)
+                        val i = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                        val intent = PendingIntent.getActivity(context, 0, i, 0)
+                        nBuilder.setContentText(url)
+                                .setStyle(Notification.BigTextStyle().bigText(url))
+                                .setContentIntent(intent)
 
-                    if (prefs.getBoolean("autoclip", false))
-                        clipManager.primaryClip = ClipData.newPlainText("URL", url)
+                        if (prefs.getBoolean("autoclip", false))
+                            clipManager.primaryClip = ClipData.newPlainText("URL", url)
+                    } catch(e: Exception) {
+                        val msg = context.resources.getString(R.string.response_text_and_error, d, e.toString())
+                        nBuilder.setContentText(context.resources.getString(R.string.response_handling_error))
+                                .setStyle(Notification.BigTextStyle().bigText(msg))
+                    }
                 }
 
                 notifManager.notify(notifID, nBuilder.build())

app/src/main/res/values/strings.xml

@@ -6,6 +6,9 @@
 	<!-- Notifications -->
 	<string name="upload_complete">Upload complete.</string>
 	<string name="upload_failed">Upload failed.</string>
+	<string name="response_handling_error">Response handling error.</string>
+
+	<string name="response_text_and_error">Response text:\n%1$s \nError:\n%2$s</string>
 
 	<!-- Toasts -->
 	<string name="failed_to_add">Failed to add %1$s: %2$s</string>