bugfix
This commit is contained in:
parent
75975a5b5d
commit
037c5acb1d
|
@ -159,7 +159,7 @@ public class MainPage extends AsyncTask<Integer, Void, Integer> {
|
|||
}
|
||||
} catch(TwitterException e) {
|
||||
returnCode = e.getErrorCode();
|
||||
if (returnCode != 420) {
|
||||
if (returnCode > 0 && returnCode != 420) {
|
||||
errMsg += e.getMessage();
|
||||
}
|
||||
return FAIL;
|
||||
|
@ -201,11 +201,13 @@ public class MainPage extends AsyncTask<Integer, Void, Integer> {
|
|||
break;
|
||||
|
||||
case FAIL:
|
||||
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);
|
||||
trendRefresh.setRefreshing(false);
|
||||
|
|
|
@ -188,7 +188,7 @@ public class ProfileLoader extends AsyncTask<Long,Void,Long> {
|
|||
}
|
||||
} 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<Long,Void,Long> {
|
|||
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -169,13 +169,14 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
|
|||
}
|
||||
catch(TwitterException e) {
|
||||
returnCode = e.getErrorCode();
|
||||
if (returnCode == 144) {
|
||||
if (returnCode > 0) {
|
||||
if (returnCode == 144)
|
||||
database.removeStatus(tweetID);
|
||||
} else if (returnCode != 136) {
|
||||
else if (returnCode != 136)
|
||||
errorMessage += e.getMessage();
|
||||
}
|
||||
return ERROR;
|
||||
}
|
||||
}
|
||||
catch(Exception err) {
|
||||
errorMessage += err.getMessage();
|
||||
errorLog.add(errorMessage);
|
||||
|
@ -295,13 +296,15 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
|
|||
ui.get().finish();
|
||||
}
|
||||
else if(mode == ERROR) {
|
||||
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 {
|
||||
} else if (returnCode != 136) {
|
||||
Toast.makeText(ui.get(), errorMessage, Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
SwipeRefreshLayout ansReload = connect.findViewById(R.id.answer_reload);
|
||||
if(ansReload.isRefreshing()) {
|
||||
ansReload.setRefreshing(false);
|
||||
|
|
|
@ -107,8 +107,7 @@ public class StatusUpload extends AsyncTask<Object, Void, Boolean> implements On
|
|||
|
||||
@Override
|
||||
public void onClick(DialogInterface d, int id) {
|
||||
TweetPopup tweetPopup = ui.get();
|
||||
tweetPopup.send();
|
||||
ui.get().send();
|
||||
}
|
||||
|
||||
public interface OnTweetSending {
|
||||
|
|
|
@ -83,7 +83,7 @@ public class TwitterSearch extends AsyncTask<String, Void, Boolean> {
|
|||
|
||||
} 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<String, Void, Boolean> {
|
|||
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();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -111,7 +111,7 @@ public class UserLists extends AsyncTask <Long, Void, Boolean> {
|
|||
}
|
||||
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 <Long, Void, Boolean> {
|
|||
} 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();
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue