Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfix

This commit is contained in:
NudeDude 2018-08-13 21:31:18 +02:00
parent 75975a5b5d
commit 037c5acb1d
8 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java
View File

@ -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,10 +201,12 @@ public class MainPage extends AsyncTask<Integer, Void, Integer> {
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);

4
app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java
View File

@ -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();
}
}

25
app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
View File

@ -169,12 +169,13 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
}
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<Long, Void, Long> {
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()) {

3
app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java
View File

@ -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 {

4
app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java
View File

@ -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();
}
}

4
app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java
View File

@ -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();

6
app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
View File

@ -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);
}

8
app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java
View File

@ -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);