From 832f6441cb552a5f0f59bf47f330c517c7511ea0 Mon Sep 17 00:00:00 2001
From: jannis <jannis@tadris.de>
Date: Wed, 8 Jan 2020 12:37:45 +0100
Subject: [PATCH] Clear access token of not valid anymore

---
 .../de/tadris/fitness/osm/OAuthAuthentication.java     |  4 ++--
 .../java/de/tadris/fitness/osm/OsmTraceUploader.java   | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/de/tadris/fitness/osm/OAuthAuthentication.java b/app/src/main/java/de/tadris/fitness/osm/OAuthAuthentication.java
index 7cad439..5e5413e 100644
--- a/app/src/main/java/de/tadris/fitness/osm/OAuthAuthentication.java
+++ b/app/src/main/java/de/tadris/fitness/osm/OAuthAuthentication.java
@@ -118,12 +118,12 @@ public class OAuthAuthentication {
                 .putBoolean("authenticated", true).apply();
     }
 
-    public void clearAccessToken(){
+    void clearAccessToken() {
         preferences.edit().putBoolean("authenticated", false).apply();
     }
 
     private void retrieveAccessToken(String verificationCode){
-        handler.post(() -> dialogController.show());
+        handler.post(dialogController::show);
         try{
             oAuthProvider.retrieveAccessToken(oAuthConsumer, verificationCode);
             handler.post(() -> {
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 1ed402c..1348150 100644
--- a/app/src/main/java/de/tadris/fitness/osm/OsmTraceUploader.java
+++ b/app/src/main/java/de/tadris/fitness/osm/OsmTraceUploader.java
@@ -93,8 +93,12 @@ public class OsmTraceUploader {
             }catch (Exception e){
                 e.printStackTrace();
                 handler.post(() -> {
-                    @StringRes int textRes= e instanceof OsmAuthorizationException ?
-                            R.string.uploadFailedOsmNotAuthorized : R.string.uploadFailed;
+                    @StringRes int textRes = R.string.uploadFailed;
+
+                    if (e instanceof OsmAuthorizationException) {
+                        textRes = R.string.uploadFailedOsmNotAuthorized;
+                        new OAuthAuthentication(handler, activity, null).clearAccessToken();
+                    }
 
                     Toast.makeText(activity, textRes, Toast.LENGTH_LONG).show();
                     dialogController.cancel();
@@ -104,7 +108,7 @@ public class OsmTraceUploader {
     }
 
     private void executeTask(){
-        handler.post(() -> dialogController.show());
+        handler.post(dialogController::show);
         setProgress(0);
         if(cut){ cut(); }
         setProgress(20);