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 f840e375..5c726dae 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java @@ -159,7 +159,7 @@ public class MainPage extends AsyncTask { } } catch(TwitterException e) { returnCode = e.getErrorCode(); - if (returnCode != 420) { + if (returnCode > 0 && returnCode != 420) { errMsg += e.getMessage(); } return FAIL; @@ -201,10 +201,12 @@ public class MainPage extends AsyncTask { break; case FAIL: - if (returnCode == 420) { - Toast.makeText(connect, R.string.rate_limit_exceeded, Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(connect, errMsg, Toast.LENGTH_LONG).show(); + if (returnCode > 0) { + if (returnCode == 420) { + Toast.makeText(connect, R.string.rate_limit_exceeded, Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(connect, errMsg, Toast.LENGTH_LONG).show(); + } } default: timelineRefresh.setRefreshing(false); 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 cffe7a74..5ccf8898 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java @@ -188,7 +188,7 @@ public class ProfileLoader extends AsyncTask { } } catch (TwitterException err) { returnCode = err.getErrorCode(); - if (returnCode != 136 && returnCode != -1) { + if (returnCode > 0 && returnCode != 136) { errMsg += err.getMessage(); errorLog.add(errMsg); } @@ -292,7 +292,7 @@ public class ProfileLoader extends AsyncTask { if (returnCode == 420) { Toast.makeText(connect, R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show(); - } else { + } else if (returnCode > 0 && returnCode != 136) { Toast.makeText(connect, 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 5afd2cf7..dbce3fc8 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java @@ -169,12 +169,13 @@ public class StatusLoader extends AsyncTask { } catch(TwitterException e) { returnCode = e.getErrorCode(); - if (returnCode == 144) { - database.removeStatus(tweetID); - } else if (returnCode != 136) { - errorMessage += e.getMessage(); + if (returnCode > 0) { + if (returnCode == 144) + database.removeStatus(tweetID); + else if (returnCode != 136) + errorMessage += e.getMessage(); + return ERROR; } - return ERROR; } catch(Exception err) { errorMessage += err.getMessage(); @@ -295,12 +296,14 @@ public class StatusLoader extends AsyncTask { ui.get().finish(); } else if(mode == ERROR) { - if (returnCode == 420) { - Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show(); - } else if (returnCode == 144) { - Toast.makeText(ui.get(), R.string.tweet_not_found, Toast.LENGTH_LONG).show(); - } else { - Toast.makeText(ui.get(), errorMessage, Toast.LENGTH_LONG).show(); + if (returnCode > 0) { + if (returnCode == 420) { + Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show(); + } else if (returnCode == 144) { + Toast.makeText(ui.get(), R.string.tweet_not_found, Toast.LENGTH_LONG).show(); + } else if (returnCode != 136) { + Toast.makeText(ui.get(), errorMessage, Toast.LENGTH_LONG).show(); + } } SwipeRefreshLayout ansReload = connect.findViewById(R.id.answer_reload); if(ansReload.isRefreshing()) { 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 9973145d..aeb1c5fe 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java @@ -107,8 +107,7 @@ public class StatusUpload extends AsyncTask implements On @Override public void onClick(DialogInterface d, int id) { - TweetPopup tweetPopup = ui.get(); - tweetPopup.send(); + ui.get().send(); } public interface OnTweetSending { 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 9262f977..5e830b8f 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java @@ -83,7 +83,7 @@ public class TwitterSearch extends AsyncTask { } catch (TwitterException err) { returnCode = err.getErrorCode(); - if (returnCode != 420 && returnCode != -1) { + if (returnCode > 0 && returnCode != 420) { errorMessage += err.getMessage(); errorLog.add(errorMessage); } @@ -103,7 +103,7 @@ public class TwitterSearch extends AsyncTask { if (!success) { if (returnCode == 420) { Toast.makeText(connect, R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show(); - } else { + } else if (returnCode > 0) { Toast.makeText(connect, errorMessage, Toast.LENGTH_LONG).show(); } } 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 130e26fd..32075958 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java @@ -111,7 +111,7 @@ public class UserLists extends AsyncTask { } catch(TwitterException err) { returnCode = err.getErrorCode(); - if (returnCode != 420) { + if (returnCode > 0 && returnCode != 420) { errorMessage += err.getMessage(); errorLog.add(errorMessage); } @@ -135,7 +135,7 @@ public class UserLists extends AsyncTask { } else { if (returnCode == 420) Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_SHORT).show(); - else + else if (returnCode > 0) Toast.makeText(ui.get(), errorMessage, Toast.LENGTH_SHORT).show(); } popup.dismiss(); 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 e9514f36..46175954 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java @@ -40,7 +40,6 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, private RecyclerView answer_list; private StatusLoader mStat, mReply; - private ImagePopup mediaContent; private SwipeRefreshLayout answerReload; private ConnectivityManager mConnect; private GlobalSettings settings; @@ -97,9 +96,6 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, mReply.cancel(true); answerReload.setRefreshing(false); } - if (mediaContent != null && !mediaContent.isCancelled()) { - mediaContent.cancel(true); - } super.onPause(); } @@ -207,7 +203,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, @Override public void onMediaClicked(String mediaLinks[]) { - mediaContent = new ImagePopup(this); + ImagePopup mediaContent = new ImagePopup(this); mediaContent.execute(mediaLinks); } diff --git a/app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java b/app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java index d2686a35..6386bc17 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java @@ -49,14 +49,6 @@ public class UserDetail extends AppCompatActivity implements OnItemClicked { getUsers(); } - @Override - protected void onPause() { - if (uList != null && !uList.isCancelled()) { - uList.cancel(true); - } - super.onPause(); - } - @Override public boolean onCreateOptionsMenu( Menu m ) { getMenuInflater().inflate(R.menu.user, m);