From d9619c73bc72fcffbcbc4ef69e52d9a7983fd3cf Mon Sep 17 00:00:00 2001 From: NudeDude Date: Sun, 2 Dec 2018 15:22:29 +0100 Subject: [PATCH] bug fix --- .../java/org/nuclearfog/twidda/MainActivity.java | 6 ++++++ .../nuclearfog/twidda/backend/ProfileLoader.java | 9 ++++++++- .../nuclearfog/twidda/backend/StatusLoader.java | 11 +++++++---- .../org/nuclearfog/twidda/window/TweetDetail.java | 15 +++++++++++++++ .../org/nuclearfog/twidda/window/UserProfile.java | 11 +++++++++++ app/src/main/res/values-de-rDE/strings.xml | 9 +++++++-- app/src/main/res/values/strings.xml | 1 + 7 files changed, 55 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/nuclearfog/twidda/MainActivity.java b/app/src/main/java/org/nuclearfog/twidda/MainActivity.java index b0052783..d264d801 100644 --- a/app/src/main/java/org/nuclearfog/twidda/MainActivity.java +++ b/app/src/main/java/org/nuclearfog/twidda/MainActivity.java @@ -36,6 +36,7 @@ import org.nuclearfog.twidda.window.TweetPopup; import org.nuclearfog.twidda.window.UserProfile; import static android.os.AsyncTask.Status.RUNNING; +import static org.nuclearfog.twidda.window.TweetDetail.CHANGED; /** * Main Activity @@ -172,6 +173,11 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener case SETTING: home = null; break; + + case TWEET: + if (returnCode == CHANGED) + home = null; + break; } } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java index dd27241e..eff6b6fe 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java @@ -300,14 +300,21 @@ public class ProfileLoader extends AsyncTask { Toast.makeText(ui.get(), R.string.unmuted, Toast.LENGTH_SHORT).show(); } else if (MODE == FAILURE) { + switch (returnCode) { case 420: Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show(); break; - case 136: + + case 50: + Toast.makeText(ui.get(), R.string.profile_not_found, Toast.LENGTH_LONG).show(); break; + case -1: + case 136: Toast.makeText(ui.get(), R.string.error_not_specified, Toast.LENGTH_LONG).show(); + break; + default: Toast.makeText(ui.get(), errMsg, Toast.LENGTH_LONG).show(); } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java index d5f8e42a..3706b8f7 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java @@ -115,7 +115,7 @@ public class StatusLoader extends AsyncTask { } catch (TwitterException err) { returnCode = err.getErrorCode(); - if (returnCode == 144) + if (returnCode == 144 || returnCode == 34) database.removeStatus(TWEETID); else errMsg += err.getMessage(); @@ -225,22 +225,25 @@ public class StatusLoader extends AsyncTask { ansReload.setRefreshing(false); if (mode == DELETE) { - Toast.makeText(ui.get(), R.string.tweet_removed, Toast.LENGTH_SHORT).show(); - ui.get().setResult(TweetDetail.CHANGED); - ui.get().finish(); + ui.get().deleteTweet(); } else if (mode == ERROR) { + switch (returnCode) { case 136: break; + case 420: Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show(); break; + + case 34: case 144: Toast.makeText(ui.get(), R.string.tweet_not_found, Toast.LENGTH_LONG).show(); ui.get().setResult(TweetDetail.CHANGED); ui.get().finish(); break; + default: Toast.makeText(ui.get(), errMsg, Toast.LENGTH_LONG).show(); } 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 f7f0db97..8c0f44ed 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java @@ -120,6 +120,15 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, } + @Override + protected void onActivityResult(int reqCode, int returnCode, Intent i) { + super.onActivityResult(reqCode, returnCode, i); + if (reqCode == TWEET && returnCode == CHANGED) { + mStat = null; + } + } + + @Override public boolean onCreateOptionsMenu(Menu m) { getMenuInflater().inflate(R.menu.tweet, m); @@ -247,4 +256,10 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, image.putExtra("link", mediaLinks); startActivity(image); } + + public void deleteTweet() { + Toast.makeText(this, R.string.tweet_removed, Toast.LENGTH_SHORT).show(); + setResult(TweetDetail.CHANGED); + finish(); + } } \ No newline at end of file diff --git a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java index 8c75c5df..d0f735cd 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java @@ -29,6 +29,7 @@ import org.nuclearfog.twidda.backend.items.Tweet; import org.nuclearfog.twidda.database.GlobalSettings; import static android.os.AsyncTask.Status.RUNNING; +import static org.nuclearfog.twidda.window.TweetDetail.CHANGED; /** * User Profile Activity @@ -131,6 +132,15 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener, } + @Override + protected void onActivityResult(int reqCode, int returnCode, Intent i) { + super.onActivityResult(reqCode, returnCode, i); + if (reqCode == TWEET && returnCode == CHANGED) { + mProfile = null; + } + } + + @Override public boolean onCreateOptionsMenu(Menu m) { getMenuInflater().inflate(R.menu.profile, m); @@ -360,6 +370,7 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener, this.canDm = canDm; } + public void imageClick(String link) { Intent image = new Intent(this, ImageDetail.class); image.putExtra("link", new String[]{link}); diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 944c82f9..0ecee585 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -75,7 +75,12 @@ Nachricht nicht gefunden! Ordner erstellt unter Pictures Bild gespeichert! - in bearbeitung... - lädt... + in bearbeitung.. + lädt.. Fehler beim Abrufen der Seite! + Profil nicht gefunden! + Tweetfenster schließen + Tweet senden + Bild hinzufügen + Bildvorschau \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b9bdba0a..9984828d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -90,4 +90,5 @@ add new image send Tweet close tweet + Profile not found! \ No newline at end of file