From 34f08f9c3bcefdfd44abac46beb764f6f5012064 Mon Sep 17 00:00:00 2001 From: NudeDude Date: Sun, 6 Jan 2019 22:28:35 +0100 Subject: [PATCH] added more error codes code reformat --- app/src/main/AndroidManifest.xml | 5 ++- .../twidda/backend/ErrorHandling.java | 45 ++++++++++++++++--- .../twidda/backend/LinkBrowser.java | 4 +- .../nuclearfog/twidda/backend/MainPage.java | 2 +- .../twidda/backend/MessageLoader.java | 2 +- .../twidda/backend/MessageUpload.java | 2 +- .../twidda/backend/ProfileLoader.java | 4 +- .../twidda/backend/StatusLoader.java | 2 +- .../twidda/backend/StatusUpload.java | 4 +- .../twidda/backend/TwitterEngine.java | 7 ++- .../twidda/backend/TwitterSearch.java | 2 +- .../nuclearfog/twidda/backend/UserLists.java | 2 +- .../twidda/database/AppDatabase.java | 2 +- .../twidda/database/DatabaseAdapter.java | 2 +- .../nuclearfog/twidda/window/TweetDetail.java | 4 +- app/src/main/res/layout/page_login.xml | 4 +- app/src/main/res/layout/popup_dm.xml | 3 +- app/src/main/res/layout/popup_tweet.xml | 3 +- app/src/main/res/values-de-rDE/strings.xml | 12 ++--- app/src/main/res/values/strings.xml | 12 ++--- 20 files changed, 78 insertions(+), 45 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 22dd0629..9c588a1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,10 +8,10 @@ + diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/ErrorHandling.java b/app/src/main/java/org/nuclearfog/twidda/backend/ErrorHandling.java index 11fff8b4..6b50a67f 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ErrorHandling.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ErrorHandling.java @@ -1,6 +1,7 @@ package org.nuclearfog.twidda.backend; import android.content.Context; +import android.net.ConnectivityManager; import android.support.annotation.NonNull; import android.widget.Toast; @@ -13,25 +14,33 @@ abstract class ErrorHandling { /** * Print twitter error message - * @param c Application Context + * + * @param c Application Context * @param error TwitterException * @return if Activity should shut down */ public static boolean printError(Context c, @NonNull TwitterException error) { - switch(error.getErrorCode()) { - + switch (error.getErrorCode()) { + case 88: case 420: // case 429: // Rate limit exceeded! - Toast.makeText(c, R.string.rate_limit_exceeded, Toast.LENGTH_SHORT).show(); + String msg = c.getString(R.string.rate_limit_exceeded); + msg += error.getRetryAfter(); + Toast.makeText(c, msg, Toast.LENGTH_SHORT).show(); break; + case 17: case 50: // USER not found case 63: // USER suspended case 136: // Blocked! Toast.makeText(c, R.string.user_not_found, Toast.LENGTH_SHORT).show(); return true; + case 32: + Toast.makeText(c, R.string.authentication_failed, Toast.LENGTH_SHORT).show(); + break; + case 34: // case 144: // TWEET not found Toast.makeText(c, R.string.tweet_not_found, Toast.LENGTH_SHORT).show(); @@ -41,12 +50,34 @@ abstract class ErrorHandling { Toast.makeText(c, R.string.cant_send_dm, Toast.LENGTH_SHORT).show(); break; - case -1: - Toast.makeText(c, R.string.error_not_specified, Toast.LENGTH_SHORT).show(); + case 179: + Toast.makeText(c, R.string.status_private, Toast.LENGTH_SHORT).show(); break; + case 186: + Toast.makeText(c, R.string.status_too_long, Toast.LENGTH_SHORT).show(); + break; + + case 187: + Toast.makeText(c, R.string.duplicate_status, Toast.LENGTH_SHORT).show(); + break; + + case 354: + Toast.makeText(c, R.string.directmessage_too_long, Toast.LENGTH_SHORT).show(); + break; + + case 89: + Toast.makeText(c, R.string.error_accesstoken, Toast.LENGTH_SHORT).show(); + break; + + case -1: default: - Toast.makeText(c, error.getErrorMessage(), Toast.LENGTH_LONG).show(); + ConnectivityManager mConnect = (ConnectivityManager) c.getSystemService(Context.CONNECTIVITY_SERVICE); + if (mConnect.getActiveNetworkInfo() == null || !mConnect.getActiveNetworkInfo().isConnected()) { + Toast.makeText(c, R.string.connection_failed, Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(c, error.getErrorMessage(), Toast.LENGTH_LONG).show(); + } } return false; } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/LinkBrowser.java b/app/src/main/java/org/nuclearfog/twidda/backend/LinkBrowser.java index f8294cbb..0731981a 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/LinkBrowser.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/LinkBrowser.java @@ -115,8 +115,8 @@ public class LinkBrowser extends AsyncTask { tweetActivity.putExtra("tweetID", tweet.getId()); ui.get().startActivity(tweetActivity); } else { - if(err != null) - ErrorHandling.printError(ui.get(),err); + if (err != null) + ErrorHandling.printError(ui.get(), err); } } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java b/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java index a6e075ee..7bdbbbe2 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java @@ -154,7 +154,7 @@ public class MainPage extends AsyncTask { trendRefresh.setRefreshing(false); mentionRefresh.setRefreshing(false); - if(err != null) { + if (err != null) { ErrorHandling.printError(ui.get(), err); } } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/MessageLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/MessageLoader.java index f87805ec..f231a24f 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/MessageLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/MessageLoader.java @@ -84,7 +84,7 @@ public class MessageLoader extends AsyncTask { mAdapter.setData(message); mAdapter.notifyDataSetChanged(); } else { - if(err != null) + if (err != null) ErrorHandling.printError(ui.get(), err); } } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/MessageUpload.java b/app/src/main/java/org/nuclearfog/twidda/backend/MessageUpload.java index 8373bad7..45566f65 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/MessageUpload.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/MessageUpload.java @@ -92,7 +92,7 @@ public class MessageUpload extends AsyncTask { Toast.makeText(ui.get(), R.string.dmsend, Toast.LENGTH_SHORT).show(); ui.get().finish(); } else { - if(err != null) + if (err != null) ErrorHandling.printError(ui.get(), err); } } 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 f2ae54c4..40444a58 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java @@ -253,7 +253,7 @@ public class ProfileLoader extends AsyncTask { } }); - ui.get().setTweetCount(user.getTweetCount(),user.getFavorCount()); + ui.get().setTweetCount(user.getTweetCount(), user.getFavorCount()); } else if (MODE == GET_TWEETS) { homeTl.setData(tweets); @@ -297,7 +297,7 @@ public class ProfileLoader extends AsyncTask { Toast.makeText(ui.get(), R.string.unmuted, Toast.LENGTH_SHORT).show(); } else if (MODE == FAILURE) { - if(err != null) { + if (err != null) { boolean killActivity = ErrorHandling.printError(ui.get(), err); if (killActivity) ui.get().finish(); 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 0bf0a9c4..2d7110c9 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java @@ -222,7 +222,7 @@ public class StatusLoader extends AsyncTask { ui.get().setResult(TWEET_REMOVED); ui.get().finish(); } else if (mode == ERROR) { - if(err != null) { + if (err != null) { boolean killActivity = ErrorHandling.printError(ui.get(), err); if (killActivity) ui.get().finish(); diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java index 55ca3ec2..893d1f6b 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java @@ -98,8 +98,8 @@ public class StatusUpload extends AsyncTask { ui.get().close(); } else { - if(err != null) - ErrorHandling.printError(ui.get(),err); + if (err != null) + ErrorHandling.printError(ui.get(), err); AlertDialog.Builder builder = new AlertDialog.Builder(ui.get()); builder.setTitle(R.string.error).setMessage(R.string.error_sending_tweet) diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java index 80542231..45ccf9ce 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java @@ -371,7 +371,6 @@ public class TwitterEngine { * @param text Tweet Text * @param reply In reply to tweet ID * @param path Path to the Media File - * @throws TwitterException if Access is unavailable */ public void sendStatus(String text, long reply, @Nullable String[] path) throws TwitterException { @@ -453,7 +452,7 @@ public class TwitterEngine { else tweet = twitter.retweetStatus(tweet.getId()); - if(tweet.getRetweetedStatus() == null) + if (tweet.getRetweetedStatus() == null) return getTweet(tweet, null); else return getTweet(tweet, getTweet(tweet.getRetweetedStatus(), null)); @@ -474,11 +473,11 @@ public class TwitterEngine { else tweet = twitter.createFavorite(tweet.getId()); - if(tweet.getRetweetedStatus() == null) + if (tweet.getRetweetedStatus() == null) return getTweet(tweet, null); else return getTweet(tweet, getTweet(tweet.getRetweetedStatus(), null)); - } + } /** diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java index c700c2bd..6bd19114 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java @@ -97,7 +97,7 @@ public class TwitterSearch extends AsyncTask { if (!success) { SwipeRefreshLayout tweetReload = ui.get().findViewById(R.id.searchtweets); tweetReload.setRefreshing(false); - if(err != null) { + if (err != null) { ErrorHandling.printError(ui.get(), err); } } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java b/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java index ef5358b4..e06ecd2a 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java @@ -72,7 +72,7 @@ public class UserLists extends AsyncTask { usrAdp.setData(user); usrAdp.notifyDataSetChanged(); } else { - if(err != null) { + if (err != null) { ErrorHandling.printError(ui.get(), err); } } diff --git a/app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java b/app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java index fc3b221d..050946ab 100644 --- a/app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java +++ b/app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java @@ -54,7 +54,7 @@ public class AppDatabase extends SQLiteOpenHelper { @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - if(oldVersion == 1 && newVersion >= 2) { + if (oldVersion == 1 && newVersion >= 2) { final String T_QUERY = "ALTER TABLE user ADD COLUMN tweetCount INTEGER DEFAULT 0;"; db.execSQL(T_QUERY); final String F_QUERY = "ALTER TABLE user ADD COLUMN favorCount INTEGER DEFAULT 0;"; diff --git a/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java b/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java index 593a38a8..575b01ad 100644 --- a/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java +++ b/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java @@ -93,7 +93,7 @@ public class DatabaseAdapter { /** * store user favors * - * @param fav tweet favored by user + * @param fav tweet favored by user * @param ownerId user ID */ public void storeUserFavs(List fav, long ownerId) { 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 307bb515..84bcd92a 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java @@ -189,14 +189,14 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, switch (v.getId()) { case R.id.rt_button_detail: - if(mStat != null && mStat.getStatus() == RUNNING) + if (mStat != null && mStat.getStatus() == RUNNING) mStat.cancel(true); mStat = new StatusLoader(this); mStat.execute(tweetID, StatusLoader.RETWEET); break; case R.id.fav_button_detail: - if(mStat != null && mStat.getStatus() == RUNNING) + if (mStat != null && mStat.getStatus() == RUNNING) mStat.cancel(true); mStat = new StatusLoader(this); mStat.execute(tweetID, StatusLoader.FAVORITE); diff --git a/app/src/main/res/layout/page_login.xml b/app/src/main/res/layout/page_login.xml index 0bab056f..4cf7ae1f 100644 --- a/app/src/main/res/layout/page_login.xml +++ b/app/src/main/res/layout/page_login.xml @@ -39,8 +39,8 @@ android:layout_height="wrap_content" android:background="@android:color/transparent" android:hint="@string/pin" - android:inputType="numberPassword" android:importantForAutofill="no" + android:inputType="numberPassword" android:singleLine="true" tools:targetApi="o" /> @@ -50,8 +50,8 @@ android:layout_height="@dimen/button_size" android:layout_marginStart="@dimen/layout_margin" android:layout_marginLeft="@dimen/layout_margin" - android:contentDescription="@string/paste_from_clipboard" android:background="@android:color/transparent" + android:contentDescription="@string/paste_from_clipboard" app:srcCompat="@drawable/copy" /> diff --git a/app/src/main/res/layout/popup_dm.xml b/app/src/main/res/layout/popup_dm.xml index ba51b284..0babf41d 100644 --- a/app/src/main/res/layout/popup_dm.xml +++ b/app/src/main/res/layout/popup_dm.xml @@ -1,6 +1,5 @@ - -PIN eingefügt! Falsches Format! Datenbank löschen? - Abrufgrenze überschritten! + "Rate-Limit erreicht, weiter in (s): " Fehler beim Senden! Tweet gesendet Fehler! @@ -58,7 +58,6 @@ Nutzername oder Nachricht eingeben! Abgebrochen! Nachricht verwerfen? - Allgemeiner Fehler! Tweet leer! ausloggen PIN verifizierung fehlgeschlagen! @@ -71,11 +70,8 @@ User entfolgen? user sperren? Nachricht löschen? - Nachricht nicht gefunden! Ordner erstellt unter Pictures Bild gespeichert! - lädt.. - Fehler beim Abrufen der Seite! Tweetfenster schließen Tweet senden Bild hinzufügen @@ -96,4 +92,10 @@ Nutzer nicht gefunden! Profile tweets Nachricht kann nicht an den User gesendet werden! + ungültiger Zugangsschlüssel! + keine Berechtigung um den Status zu sehen! + Status ist zu lang! + Tweet wurde schon versendet! + Direktnachricht länge überschritten! + Authentifikation fehlgeschlagen! \ 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 87e87c75..2c052dcc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -37,7 +37,7 @@ PIN added! not valid! delete database? - Rate limit exceeded + "Rate limit exceeded, retry after(s): " error while sending tweet sent Error! @@ -66,7 +66,6 @@ enter username or message! canceled! cancel message? - not specidfied error! empty tweet! log out! PIN verification failed! @@ -79,11 +78,8 @@ block user? log out? cancel tweet? - message not found! folder created under Pictures! image saved! - loading.. - error while loading site! Image preview add new image send Tweet @@ -104,4 +100,10 @@ user not found! Profile tweets cannot send dm to user! + Invalid or expired token! + You are not authorized to see this Status! + Tweet needs to be shorter! + Duplicate Status! + direct message text is over the limit! + failed to authenticate! \ No newline at end of file