From 9606014a265360021ce9ce0076425b63b001e450 Mon Sep 17 00:00:00 2001
From: NudeDude <extremeoverclocking>
Date: Sun, 23 Jun 2019 13:20:14 +0200
Subject: [PATCH] bug fix

---
 .../java/org/nuclearfog/twidda/backend/helper/ErrorHandler.java | 2 +-
 .../java/org/nuclearfog/twidda/database/GlobalSettings.java     | 1 +
 app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java | 2 +-
 app/src/main/res/values-de-rDE/strings.xml                      | 2 +-
 app/src/main/res/values/strings.xml                             | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/helper/ErrorHandler.java b/app/src/main/java/org/nuclearfog/twidda/backend/helper/ErrorHandler.java
index 72de9071..3374751e 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/helper/ErrorHandler.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/helper/ErrorHandler.java
@@ -42,7 +42,7 @@ public abstract class ErrorHandler {
 
             case 34:    //
             case 144:   // TWEET not found
-                Toast.makeText(c, R.string.tweet_not_found, Toast.LENGTH_SHORT).show();
+                Toast.makeText(c, R.string.not_found, Toast.LENGTH_SHORT).show();
                 return true;
 
             case 150:
diff --git a/app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java b/app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java
index d6460aa3..e9a2069a 100644
--- a/app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java
+++ b/app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java
@@ -410,6 +410,7 @@ public class GlobalSettings {
      * Remove all user content from Shared Preferences
      */
     public void logout() {
+        ourInstance = null;
         loggedIn = false;
         Editor e = settings.edit();
         e.clear();
diff --git a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
index a03b289e..acd06f90 100644
--- a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
+++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
@@ -259,7 +259,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
                 link = link.substring(end + 8);
                 tweetID = Long.parseLong(link);
             } else {
-                Toast.makeText(this, R.string.tweet_not_found, LENGTH_SHORT).show();
+                Toast.makeText(this, R.string.not_found, LENGTH_SHORT).show();
                 Intent intent = new Intent(this, MainActivity.class);
                 startActivity(intent);
                 finish();
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 4c8a93ea..73e078c9 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -29,7 +29,7 @@
     <string name="error">Fehler!</string>
     <string name="tweet_delete">Tweet löschen</string>
     <string name="get_tweetlink">Im Browser öffnen</string>
-    <string name="tweet_not_found">Tweet wurde nicht gefunden</string>
+    <string name="not_found">night gefunden!</string>
     <string name="unfollow">entfolgen</string>
     <string name="block">blocken</string>
     <string name="unblock">entblocken</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c5dee9b6..f633a5d4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,7 +37,7 @@
     <string name="error">Error!</string>
     <string name="tweet_delete">Delete</string>
     <string name="get_tweetlink">Open in Browser</string>
-    <string name="tweet_not_found">Tweet not found</string>
+    <string name="not_found">not found!</string>
     <string name="unfollow">unfollow</string>
     <string name="unblock">unblock</string>
     <string name="followed">followed</string>