From 8dd91d056b029a9bb2ab37465530943eadc1fcc9 Mon Sep 17 00:00:00 2001
From: NudeDude <hatespirit666@gmail.com>
Date: Mon, 30 Jul 2018 20:24:42 +0200
Subject: [PATCH] bugfix

---
 .../java/org/nuclearfog/twidda/backend/StatusLoader.java  | 8 --------
 .../java/org/nuclearfog/twidda/backend/StatusUpload.java  | 3 ++-
 .../org/nuclearfog/twidda/database/DatabaseAdapter.java   | 6 ++++--
 3 files changed, 6 insertions(+), 11 deletions(-)

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 93fde524..a6305a14 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
@@ -106,17 +106,9 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
                 tweet = mTwitter.getStatus(tweetID);
                 if(database.containStatus(tweetID)) {
                     database.updateStatus(tweet);
-                    if(tweet.embedded != null) {
-                        database.updateStatus(tweet.embedded);
-                    }
                 }
             }
 
-            if (tweet.embedded != null) {
-                tweet = tweet.embedded;
-                tweetID = tweet.tweetID;
-            }
-
             tweetReplyID = tweet.replyID;
             verified = tweet.user.isVerified;
             tweetStr = tweet.tweet;
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 77e15f21..18c4423f 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java
@@ -3,6 +3,7 @@ package org.nuclearfog.twidda.backend;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
 import android.os.AsyncTask;
 import android.view.View;
 import android.widget.EditText;
@@ -14,7 +15,7 @@ import org.nuclearfog.twidda.window.TweetPopup;
 
 import java.lang.ref.WeakReference;
 
-public class StatusUpload extends AsyncTask<Object, Void, Boolean> implements AlertDialog.OnClickListener {
+public class StatusUpload extends AsyncTask<Object, Void, Boolean> implements OnClickListener {
 
     private WeakReference<TweetPopup> ui;
     private TwitterEngine mTwitter;
diff --git a/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java b/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
index 8899dbfd..bfcc0a6a 100644
--- a/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
@@ -396,13 +396,15 @@ public class DatabaseAdapter {
 
     private void storeStatus(Tweet tweet, int newStatusregister, SQLiteDatabase db) {
         ContentValues status = new ContentValues();
+        TwitterUser mUser = tweet.user;
         Tweet rtStat = tweet.embedded;
         long rtId = 1L;
+
         if(rtStat != null) {
             storeStatus(rtStat,0, db);
             rtId = rtStat.tweetID;
         }
-        TwitterUser mUser = tweet.user;
+
         storeUser(mUser,db);
         status.put("tweetID", tweet.tweetID);
         status.put("userID", mUser.userID);
@@ -413,8 +415,8 @@ public class DatabaseAdapter {
         status.put("replyID", tweet.replyID);
         status.put("replyname", tweet.replyName);
         status.put("retweet", tweet.retweet);
-        status.put("retweeterID", tweet.retweetId);
         status.put("favorite", tweet.favorit);
+        status.put("retweeterID", tweet.retweetId);
         status.put("replyUserID", tweet.replyUserId);
         String[] medialinks = tweet.media;
         StringBuilder media = new StringBuilder();