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

bug fix, cleanup

This commit is contained in:
NudeDude 2019-06-14 17:08:08 +02:00
parent a9dfb4a5c6
commit 682208ec72
7 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,12 +299,11 @@ public class StatusLoader extends AsyncTask<Long, Tweet, Tweet> {
break; break;
} }
} else if (err != null) { } else if (err != null) {
int rCode = err.getErrorCode();
if (rCode == 144 || rCode == 34 || rCode == 63)
ui.get().setResult(RETURN_TWEET_CHANGED);
boolean killActivity = ErrorHandler.printError(ui.get(), err); boolean killActivity = ErrorHandler.printError(ui.get(), err);
if (killActivity) if (killActivity) {
ui.get().setResult(RETURN_TWEET_CHANGED);
ui.get().finish(); ui.get().finish();
}
} }
} }
} }

2
app/src/main/java/org/nuclearfog/twidda/backend/items/Tweet.java
View File

@ -280,7 +280,7 @@ public class Tweet {
if (mediaEntities.length > 0) { // remove twitter media links from tweet if (mediaEntities.length > 0) { // remove twitter media links from tweet
int lastLinkPos = mediaEntities.length - 1; int lastLinkPos = mediaEntities.length - 1;
int start = mediaEntities[lastLinkPos].getStart(); int start = mediaEntities[lastLinkPos].getStart();
int end = mediaEntities[lastLinkPos].getEnd() - 1; int end = mediaEntities[lastLinkPos].getEnd();
tweet = tweet.delete(start, end); tweet = tweet.delete(start, end);
} }
return tweet.toString(); return tweet.toString();

12
app/src/main/java/org/nuclearfog/twidda/fragment/MessageListFragment.java
View File

@ -25,6 +25,10 @@ import org.nuclearfog.twidda.window.SearchPage;
import org.nuclearfog.twidda.window.UserProfile; import org.nuclearfog.twidda.window.UserProfile;
import static android.os.AsyncTask.Status.RUNNING; import static android.os.AsyncTask.Status.RUNNING;
import static org.nuclearfog.twidda.window.MessagePopup.KEY_DM_ADDITION;
import static org.nuclearfog.twidda.window.SearchPage.KEY_SEARCH;
import static org.nuclearfog.twidda.window.UserProfile.KEY_PROFILE_ID;
import static org.nuclearfog.twidda.window.UserProfile.KEY_PROFILE_NAME;
public class MessageListFragment extends Fragment implements OnRefreshListener, OnItemSelected { public class MessageListFragment extends Fragment implements OnRefreshListener, OnItemSelected {
@ -88,7 +92,7 @@ public class MessageListFragment extends Fragment implements OnRefreshListener,
public void onClick(String tag) { public void onClick(String tag) {
if (!reload.isRefreshing()) { if (!reload.isRefreshing()) {
Intent intent = new Intent(getContext(), SearchPage.class); Intent intent = new Intent(getContext(), SearchPage.class);
intent.putExtra("search", tag); intent.putExtra(KEY_SEARCH, tag);
startActivity(intent); startActivity(intent);
} }
} }
@ -100,7 +104,7 @@ public class MessageListFragment extends Fragment implements OnRefreshListener,
switch (action) { switch (action) {
case ANSWER: case ANSWER:
Intent sendDm = new Intent(getContext(), MessagePopup.class); Intent sendDm = new Intent(getContext(), MessagePopup.class);
sendDm.putExtra("username", message.getSender().getScreenname()); sendDm.putExtra(KEY_DM_ADDITION, message.getSender().getScreenname());
startActivity(sendDm); startActivity(sendDm);
break; break;
@ -111,8 +115,8 @@ public class MessageListFragment extends Fragment implements OnRefreshListener,
case PROFILE: case PROFILE:
Intent profile = new Intent(getContext(), UserProfile.class); Intent profile = new Intent(getContext(), UserProfile.class);
profile.putExtra("userID", message.getSender().getId()); profile.putExtra(KEY_PROFILE_ID, message.getSender().getId());
profile.putExtra("username", message.getSender().getScreenname()); profile.putExtra(KEY_PROFILE_NAME, message.getSender().getScreenname());
startActivity(profile); startActivity(profile);
break; break;
} }

3
app/src/main/java/org/nuclearfog/twidda/fragment/TrendListFragment.java
View File

@ -22,6 +22,7 @@ import org.nuclearfog.twidda.fragment.backend.TrendLoader;
import org.nuclearfog.twidda.window.SearchPage; import org.nuclearfog.twidda.window.SearchPage;
import static android.os.AsyncTask.Status.RUNNING; import static android.os.AsyncTask.Status.RUNNING;
import static org.nuclearfog.twidda.window.SearchPage.KEY_SEARCH;
public class TrendListFragment extends Fragment implements OnRefreshListener, OnItemClickListener, OnStateChange { public class TrendListFragment extends Fragment implements OnRefreshListener, OnItemClickListener, OnStateChange {
@ -89,7 +90,7 @@ public class TrendListFragment extends Fragment implements OnRefreshListener, On
Intent intent = new Intent(getContext(), SearchPage.class); Intent intent = new Intent(getContext(), SearchPage.class);
if (!search.startsWith("#")) if (!search.startsWith("#"))
search = '\"' + search + '\"'; search = '\"' + search + '\"';
intent.putExtra("search", search); intent.putExtra(KEY_SEARCH, search);
startActivity(intent); startActivity(intent);
} }
} }

6
app/src/main/java/org/nuclearfog/twidda/fragment/TweetListFragment.java
View File

@ -24,6 +24,8 @@ import org.nuclearfog.twidda.fragment.backend.TweetLoader.Mode;
import org.nuclearfog.twidda.window.TweetDetail; import org.nuclearfog.twidda.window.TweetDetail;
import static android.os.AsyncTask.Status.RUNNING; import static android.os.AsyncTask.Status.RUNNING;
import static org.nuclearfog.twidda.window.TweetDetail.KEY_TWEET_ID;
import static org.nuclearfog.twidda.window.TweetDetail.KEY_TWEET_NAME;
public class TweetListFragment extends Fragment implements OnRefreshListener, OnItemClickListener, OnStateChange { public class TweetListFragment extends Fragment implements OnRefreshListener, OnItemClickListener, OnStateChange {
@ -137,8 +139,8 @@ public class TweetListFragment extends Fragment implements OnRefreshListener, On
if (tweet.getEmbeddedTweet() != null) if (tweet.getEmbeddedTweet() != null)
tweet = tweet.getEmbeddedTweet(); tweet = tweet.getEmbeddedTweet();
Intent tweetIntent = new Intent(getContext(), TweetDetail.class); Intent tweetIntent = new Intent(getContext(), TweetDetail.class);
tweetIntent.putExtra("tweetID", tweet.getId()); tweetIntent.putExtra(KEY_TWEET_ID, tweet.getId());
tweetIntent.putExtra("username", tweet.getUser().getScreenname()); tweetIntent.putExtra(KEY_TWEET_NAME, tweet.getUser().getScreenname());
startActivityForResult(tweetIntent, REQUEST_TWEET_CHANGED); startActivityForResult(tweetIntent, REQUEST_TWEET_CHANGED);
} }
} }

6
app/src/main/java/org/nuclearfog/twidda/fragment/UserListFragment.java
View File

@ -24,6 +24,8 @@ import org.nuclearfog.twidda.fragment.backend.UserLoader.Mode;
import org.nuclearfog.twidda.window.UserProfile; import org.nuclearfog.twidda.window.UserProfile;
import static android.os.AsyncTask.Status.RUNNING; import static android.os.AsyncTask.Status.RUNNING;
import static org.nuclearfog.twidda.window.UserProfile.KEY_PROFILE_ID;
import static org.nuclearfog.twidda.window.UserProfile.KEY_PROFILE_NAME;
public class UserListFragment extends Fragment implements OnRefreshListener, OnItemClickListener { public class UserListFragment extends Fragment implements OnRefreshListener, OnItemClickListener {
@ -114,8 +116,8 @@ public class UserListFragment extends Fragment implements OnRefreshListener, OnI
long userID = user.getId(); long userID = user.getId();
String username = user.getScreenname(); String username = user.getScreenname();
Intent intent = new Intent(getContext(), UserProfile.class); Intent intent = new Intent(getContext(), UserProfile.class);
intent.putExtra("userID", userID); intent.putExtra(KEY_PROFILE_ID, userID);
intent.putExtra("username", username); intent.putExtra(KEY_PROFILE_NAME, username);
startActivity(intent); startActivity(intent);
} }
} }

2
app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java
View File

@ -90,7 +90,7 @@ public class SearchPage extends AppCompatActivity implements OnTabSelectedListen
@Override @Override
public boolean onQueryTextSubmit(String s) { public boolean onQueryTextSubmit(String s) {
Intent intent = new Intent(SearchPage.this, SearchPage.class); Intent intent = new Intent(SearchPage.this, SearchPage.class);
intent.putExtra("search", s); intent.putExtra(KEY_SEARCH, s);
startActivity(intent); startActivity(intent);
return true; return true;
} }