Mastodon/Shitter-android-app
1
0
Fork 0
mirror of https://github.com/nuclearfog/Shitter.git synced 2025-02-07 15:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

database bug fix

Browse Source
This commit is contained in:
NudeDude 2019-06-04 18:47:49 +02:00
parent da28fd3c2e
commit 15aa09400f
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@ -5,7 +5,7 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations> </configurations>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

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

@ -45,7 +45,7 @@ import static org.nuclearfog.twidda.window.TweetDetail.KEY_TWEET_ID;
import static org.nuclearfog.twidda.window.TweetDetail.KEY_TWEET_NAME; import static org.nuclearfog.twidda.window.TweetDetail.KEY_TWEET_NAME;
public class StatusLoader extends AsyncTask<Long, Void, Void> { public class StatusLoader extends AsyncTask<Long, Tweet, Void> {
public enum Mode { public enum Mode {
LOAD, LOAD,
@ -62,7 +62,6 @@ public class StatusLoader extends AsyncTask<Long, Void, Void> {
private WeakReference<TweetDetail> ui; private WeakReference<TweetDetail> ui;
private SimpleDateFormat sdf; private SimpleDateFormat sdf;
private NumberFormat formatter; private NumberFormat formatter;
private Tweet tweet;
private long homeId; private long homeId;
private int font_color, highlight; private int font_color, highlight;
private boolean toggleImg; private boolean toggleImg;
@ -84,6 +83,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Void> {
@Override @Override
protected Void doInBackground(Long... data) { protected Void doInBackground(Long... data) {
Tweet tweet;
final long TWEETID = data[0]; final long TWEETID = data[0];
boolean updateStatus = false; boolean updateStatus = false;
DatabaseAdapter db = new DatabaseAdapter(ui.get()); DatabaseAdapter db = new DatabaseAdapter(ui.get());
@ -92,11 +92,11 @@ public class StatusLoader extends AsyncTask<Long, Void, Void> {
case LOAD: case LOAD:
tweet = db.getStatus(TWEETID); tweet = db.getStatus(TWEETID);
if (tweet != null) { if (tweet != null) {
publishProgress(); publishProgress(tweet);
updateStatus = true; updateStatus = true;
} }
tweet = mTwitter.getStatus(TWEETID); tweet = mTwitter.getStatus(TWEETID);
publishProgress(); publishProgress(tweet);
if (updateStatus) if (updateStatus)
db.updateStatus(tweet); db.updateStatus(tweet);
break; break;
@ -108,7 +108,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Void> {
case RETWEET: case RETWEET:
tweet = mTwitter.retweet(TWEETID); tweet = mTwitter.retweet(TWEETID);
publishProgress(); publishProgress(tweet);
if (!tweet.retweeted()) if (!tweet.retweeted())
db.removeRetweet(TWEETID); db.removeRetweet(TWEETID);
@ -117,10 +117,10 @@ public class StatusLoader extends AsyncTask<Long, Void, Void> {
case FAVORITE: case FAVORITE:
tweet = mTwitter.favorite(TWEETID); tweet = mTwitter.favorite(TWEETID);
publishProgress(); publishProgress(tweet);
if (tweet.favored()) if (tweet.favored())
db.storeFavorite(TWEETID); db.storeFavorite(tweet);
else else
db.removeFavorite(TWEETID); db.removeFavorite(TWEETID);
break; break;
@ -141,7 +141,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Void> {
@Override @Override
protected void onProgressUpdate(Void... v) { protected void onProgressUpdate(Tweet[] tweets) {
if (ui.get() == null) return; if (ui.get() == null) return;
TextView username = ui.get().findViewById(R.id.usernamedetail); TextView username = ui.get().findViewById(R.id.usernamedetail);
@ -151,6 +151,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Void> {
Button retweetButton = ui.get().findViewById(R.id.tweet_retweet); Button retweetButton = ui.get().findViewById(R.id.tweet_retweet);
Button favoriteButton = ui.get().findViewById(R.id.tweet_favorit); Button favoriteButton = ui.get().findViewById(R.id.tweet_favorit);
final Tweet tweet = tweets[0];
if (mode == Mode.LOAD) { if (mode == Mode.LOAD) {
View tweet_header = ui.get().findViewById(R.id.tweet_head); View tweet_header = ui.get().findViewById(R.id.tweet_head);
if (tweet_header.getVisibility() != VISIBLE) { if (tweet_header.getVisibility() != VISIBLE) {

13
app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
View File

@ -143,23 +143,20 @@ public class DatabaseAdapter {
/** /**
* store tweet ID of a favored tweet by the current user * store tweet ID of a favored tweet by the current user
* *
* @param tweetID Tweet ID * @param tweet favored tweet
*/ */
public void storeFavorite(long tweetID) { public void storeFavorite(Tweet tweet) {
SQLiteDatabase db = getDbWrite(); SQLiteDatabase db = getDbWrite();
ContentValues favTable = new ContentValues(); long tweetID = tweet.getId();
ContentValues status = new ContentValues();
int register = getTweetStatus(db, tweetID); int register = getTweetStatus(db, tweetID);
register |= FAV_MASK; register |= FAV_MASK;
ContentValues favTable = new ContentValues();
favTable.put("tweetID", tweetID); favTable.put("tweetID", tweetID);
favTable.put("ownerID", homeId); favTable.put("ownerID", homeId);
status.put("statusregister", register);
db.insertWithOnConflict("favorit", null, favTable, CONFLICT_IGNORE); db.insertWithOnConflict("favorit", null, favTable, CONFLICT_IGNORE);
db.update("tweet", status, "tweet.tweetID=" + tweetID, null); storeStatus(tweet, register, db);
commit(db); commit(db);
} }