From 3a0c38fdb402b1e5b60654eaa250e576ac5dba6c Mon Sep 17 00:00:00 2001
From: jannis <jannis@tadris.de>
Date: Fri, 3 Jan 2020 15:06:50 +0100
Subject: [PATCH] Bugfix: handle if OSM-OAuth key isn't valid andmore

---
 .../java/de/tadris/fitness/osm/OsmTraceUploader.java | 12 +++++++++---
 app/src/main/res/values/strings.xml                  |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/de/tadris/fitness/osm/OsmTraceUploader.java b/app/src/main/java/de/tadris/fitness/osm/OsmTraceUploader.java
index e1b8e54..0fb64ea 100644
--- a/app/src/main/java/de/tadris/fitness/osm/OsmTraceUploader.java
+++ b/app/src/main/java/de/tadris/fitness/osm/OsmTraceUploader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
+ * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
  *
  * This file is part of FitoTrack
  *
@@ -24,6 +24,8 @@ import android.os.Handler;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.StringRes;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -34,6 +36,7 @@ import de.tadris.fitness.data.Workout;
 import de.tadris.fitness.data.WorkoutSample;
 import de.tadris.fitness.view.ProgressDialogController;
 import de.westnordost.osmapi.OsmConnection;
+import de.westnordost.osmapi.common.errors.OsmAuthorizationException;
 import de.westnordost.osmapi.traces.GpsTraceDetails;
 import de.westnordost.osmapi.traces.GpsTracesDao;
 import de.westnordost.osmapi.traces.GpsTrackpoint;
@@ -85,12 +88,15 @@ public class OsmTraceUploader {
 
     public void upload(){
         new Thread(() -> {
-            try{
+            try {
                 executeTask();
             }catch (Exception e){
                 e.printStackTrace();
                 handler.post(() -> {
-                    Toast.makeText(activity, R.string.uploadFailed, Toast.LENGTH_LONG).show();
+                    @StringRes int textRes= e instanceof OsmAuthorizationException ?
+                            R.string.uploadFailedOsmNotAuthorized : R.string.uploadFailed;
+
+                    Toast.makeText(activity, textRes, Toast.LENGTH_LONG).show();
                     dialogController.cancel();
                 });
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bd74019..da6a17b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
+  ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
   ~
   ~ This file is part of FitoTrack
   ~
@@ -68,6 +68,7 @@
     <string name="upload">Upload</string>
     <string name="uploadSuccessful">Upload Successful</string>
     <string name="uploadFailed">Upload Failed</string>
+    <string name="uploadFailedOsmNotAuthorized">Not authorized, try again</string>
 
     <string name="workoutAscent">Ascent</string>
     <string name="workoutDescent">Descent</string>