parent
d9619c73bc
commit
9df18718db
|
@ -36,7 +36,7 @@ import org.nuclearfog.twidda.window.TweetPopup;
|
||||||
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.TweetDetail.CHANGED;
|
import static org.nuclearfog.twidda.window.TweetDetail.TWEET_REMOVED;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Main Activity
|
* Main Activity
|
||||||
|
@ -175,7 +175,7 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TWEET:
|
case TWEET:
|
||||||
if (returnCode == CHANGED)
|
if (returnCode == TWEET_REMOVED)
|
||||||
home = null;
|
home = null;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -240,8 +240,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
|
||||||
case 34:
|
case 34:
|
||||||
case 144:
|
case 144:
|
||||||
Toast.makeText(ui.get(), R.string.tweet_not_found, Toast.LENGTH_LONG).show();
|
Toast.makeText(ui.get(), R.string.tweet_not_found, Toast.LENGTH_LONG).show();
|
||||||
ui.get().setResult(TweetDetail.CHANGED);
|
ui.get().deleteTweet();
|
||||||
ui.get().finish();
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -13,7 +13,6 @@ import android.view.Window;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import org.nuclearfog.twidda.R;
|
import org.nuclearfog.twidda.R;
|
||||||
import org.nuclearfog.twidda.database.DatabaseAdapter;
|
|
||||||
import org.nuclearfog.twidda.window.TweetPopup;
|
import org.nuclearfog.twidda.window.TweetPopup;
|
||||||
|
|
||||||
import java.lang.ref.WeakReference;
|
import java.lang.ref.WeakReference;
|
||||||
|
@ -24,7 +23,6 @@ import twitter4j.TwitterException;
|
||||||
public class StatusUpload extends AsyncTask<String, Void, Boolean> {
|
public class StatusUpload extends AsyncTask<String, Void, Boolean> {
|
||||||
|
|
||||||
private WeakReference<TweetPopup> ui;
|
private WeakReference<TweetPopup> ui;
|
||||||
private DatabaseAdapter database;
|
|
||||||
private TwitterEngine mTwitter;
|
private TwitterEngine mTwitter;
|
||||||
private LayoutInflater inflater;
|
private LayoutInflater inflater;
|
||||||
private Dialog popup;
|
private Dialog popup;
|
||||||
|
@ -36,7 +34,6 @@ public class StatusUpload extends AsyncTask<String, Void, Boolean> {
|
||||||
ui = new WeakReference<>(context);
|
ui = new WeakReference<>(context);
|
||||||
mTwitter = TwitterEngine.getInstance(context);
|
mTwitter = TwitterEngine.getInstance(context);
|
||||||
inflater = LayoutInflater.from(context);
|
inflater = LayoutInflater.from(context);
|
||||||
database = new DatabaseAdapter(context);
|
|
||||||
popup = new Dialog(context);
|
popup = new Dialog(context);
|
||||||
this.tweet = tweet;
|
this.tweet = tweet;
|
||||||
this.replyId = replyId;
|
this.replyId = replyId;
|
||||||
|
@ -99,8 +96,8 @@ public class StatusUpload extends AsyncTask<String, Void, Boolean> {
|
||||||
|
|
||||||
popup.dismiss();
|
popup.dismiss();
|
||||||
if (success) {
|
if (success) {
|
||||||
Toast.makeText(ui.get(), R.string.tweet_sent, Toast.LENGTH_LONG).show();
|
ui.get().close();
|
||||||
ui.get().finish();
|
|
||||||
} else {
|
} else {
|
||||||
AlertDialog.Builder builder = new AlertDialog.Builder(ui.get());
|
AlertDialog.Builder builder = new AlertDialog.Builder(ui.get());
|
||||||
builder.setTitle(R.string.error).setMessage(R.string.error_sending_tweet)
|
builder.setTitle(R.string.error).setMessage(R.string.error_sending_tweet)
|
||||||
|
|
|
@ -432,6 +432,7 @@ public class TwitterEngine {
|
||||||
Query query = new Query("to:" + name + " since_id:" + sinceId + " -filter:retweets");
|
Query query = new Query("to:" + name + " since_id:" + sinceId + " -filter:retweets");
|
||||||
query.setCount(load);
|
query.setCount(load);
|
||||||
QueryResult result = twitter.search(query);
|
QueryResult result = twitter.search(query);
|
||||||
|
|
||||||
List<twitter4j.Status> stats = result.getTweets();
|
List<twitter4j.Status> stats = result.getTweets();
|
||||||
for (twitter4j.Status reply : stats) {
|
for (twitter4j.Status reply : stats) {
|
||||||
if (reply.getInReplyToStatusId() == tweetId) {
|
if (reply.getInReplyToStatusId() == tweetId) {
|
||||||
|
@ -474,6 +475,7 @@ public class TwitterEngine {
|
||||||
public Tweet favorite(long tweetId) throws TwitterException {
|
public Tweet favorite(long tweetId) throws TwitterException {
|
||||||
Tweet tweet = getStatus(tweetId);
|
Tweet tweet = getStatus(tweetId);
|
||||||
int favorite = tweet.getFavorCount();
|
int favorite = tweet.getFavorCount();
|
||||||
|
|
||||||
if (tweet.favorized()) {
|
if (tweet.favorized()) {
|
||||||
twitter.destroyFavorite(tweet.getId());
|
twitter.destroyFavorite(tweet.getId());
|
||||||
favorite--;
|
favorite--;
|
||||||
|
@ -572,16 +574,10 @@ public class TwitterEngine {
|
||||||
*/
|
*/
|
||||||
private List<TwitterUser> convertUserList(List<User> users) {
|
private List<TwitterUser> convertUserList(List<User> users) {
|
||||||
List<TwitterUser> result = new ArrayList<>();
|
List<TwitterUser> result = new ArrayList<>();
|
||||||
if (users.isEmpty())
|
|
||||||
return result;
|
|
||||||
for (User user : users) {
|
for (User user : users) {
|
||||||
try {
|
TwitterUser item = getUser(user);
|
||||||
TwitterUser item = getUser(user);
|
result.add(item);
|
||||||
result.add(item);
|
|
||||||
} catch (Exception err) {
|
|
||||||
// Bug in Twitter4J caused by 'withheld accounts'
|
|
||||||
// because of empty profile image URL
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -595,23 +591,16 @@ public class TwitterEngine {
|
||||||
*/
|
*/
|
||||||
private List<Tweet> convertStatusList(List<Status> statuses) {
|
private List<Tweet> convertStatusList(List<Status> statuses) {
|
||||||
List<Tweet> result = new ArrayList<>();
|
List<Tweet> result = new ArrayList<>();
|
||||||
if (statuses.isEmpty())
|
|
||||||
return result;
|
|
||||||
|
|
||||||
for (Status status : statuses) {
|
for (Status status : statuses) {
|
||||||
try {
|
Status embedded = status.getRetweetedStatus();
|
||||||
Status embedded = status.getRetweetedStatus();
|
if (embedded != null) {
|
||||||
if (embedded != null) {
|
Tweet retweet = getTweet(embedded, null);
|
||||||
Tweet retweet = getTweet(embedded, null);
|
Tweet tweet = getTweet(status, retweet);
|
||||||
Tweet tweet = getTweet(status, retweet);
|
result.add(tweet);
|
||||||
result.add(tweet);
|
} else {
|
||||||
} else {
|
Tweet tweet = getTweet(status, null);
|
||||||
Tweet tweet = getTweet(status, null);
|
result.add(tweet);
|
||||||
result.add(tweet);
|
|
||||||
}
|
|
||||||
} catch (Exception err) {
|
|
||||||
// Bug in Twitter4J caused by 'withheld accounts'
|
|
||||||
// because of empty profile image URL
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
|
|
@ -39,7 +39,7 @@ import static android.os.AsyncTask.Status.RUNNING;
|
||||||
public class TweetDetail extends AppCompatActivity implements OnClickListener,
|
public class TweetDetail extends AppCompatActivity implements OnClickListener,
|
||||||
OnItemClickListener, OnRefreshListener, OnTagClickListener {
|
OnItemClickListener, OnRefreshListener, OnTagClickListener {
|
||||||
|
|
||||||
public static final int CHANGED = 1;
|
public static final int TWEET_REMOVED = 1;
|
||||||
private static final int TWEET = 2;
|
private static final int TWEET = 2;
|
||||||
|
|
||||||
private RecyclerView answer_list;
|
private RecyclerView answer_list;
|
||||||
|
@ -123,7 +123,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
|
||||||
@Override
|
@Override
|
||||||
protected void onActivityResult(int reqCode, int returnCode, Intent i) {
|
protected void onActivityResult(int reqCode, int returnCode, Intent i) {
|
||||||
super.onActivityResult(reqCode, returnCode, i);
|
super.onActivityResult(reqCode, returnCode, i);
|
||||||
if (reqCode == TWEET && returnCode == CHANGED) {
|
if (reqCode == TWEET && returnCode == TWEET_REMOVED) {
|
||||||
mStat = null;
|
mStat = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -259,7 +259,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
|
||||||
|
|
||||||
public void deleteTweet() {
|
public void deleteTweet() {
|
||||||
Toast.makeText(this, R.string.tweet_removed, Toast.LENGTH_SHORT).show();
|
Toast.makeText(this, R.string.tweet_removed, Toast.LENGTH_SHORT).show();
|
||||||
setResult(TweetDetail.CHANGED);
|
setResult(TWEET_REMOVED);
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -164,6 +164,12 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void close() {
|
||||||
|
Toast.makeText(this, R.string.tweet_sent, Toast.LENGTH_LONG).show();
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private void showClosingMsg() {
|
private void showClosingMsg() {
|
||||||
if (!addition.equals(tweet.getText().toString()) || imgIndex > 0) {
|
if (!addition.equals(tweet.getText().toString()) || imgIndex > 0) {
|
||||||
Builder closeDialog = new Builder(this);
|
Builder closeDialog = new Builder(this);
|
||||||
|
|
|
@ -29,7 +29,7 @@ import org.nuclearfog.twidda.backend.items.Tweet;
|
||||||
import org.nuclearfog.twidda.database.GlobalSettings;
|
import org.nuclearfog.twidda.database.GlobalSettings;
|
||||||
|
|
||||||
import static android.os.AsyncTask.Status.RUNNING;
|
import static android.os.AsyncTask.Status.RUNNING;
|
||||||
import static org.nuclearfog.twidda.window.TweetDetail.CHANGED;
|
import static org.nuclearfog.twidda.window.TweetDetail.TWEET_REMOVED;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* User Profile Activity
|
* User Profile Activity
|
||||||
|
@ -135,7 +135,7 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener,
|
||||||
@Override
|
@Override
|
||||||
protected void onActivityResult(int reqCode, int returnCode, Intent i) {
|
protected void onActivityResult(int reqCode, int returnCode, Intent i) {
|
||||||
super.onActivityResult(reqCode, returnCode, i);
|
super.onActivityResult(reqCode, returnCode, i);
|
||||||
if (reqCode == TWEET && returnCode == CHANGED) {
|
if (reqCode == TWEET && returnCode == TWEET_REMOVED) {
|
||||||
mProfile = null;
|
mProfile = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -196,7 +196,7 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener,
|
||||||
Intent tweet = new Intent(this, TweetPopup.class);
|
Intent tweet = new Intent(this, TweetPopup.class);
|
||||||
if (!home)
|
if (!home)
|
||||||
tweet.putExtra("Addition", username);
|
tweet.putExtra("Addition", username);
|
||||||
startActivityForResult(tweet, TWEET);
|
startActivity(tweet);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case R.id.profile_follow:
|
case R.id.profile_follow:
|
||||||
|
|
|
@ -38,6 +38,8 @@
|
||||||
android:id="@+id/img_preview"
|
android:id="@+id/img_preview"
|
||||||
android:layout_width="@dimen/tweet_button_size"
|
android:layout_width="@dimen/tweet_button_size"
|
||||||
android:layout_height="@dimen/tweet_button_size"
|
android:layout_height="@dimen/tweet_button_size"
|
||||||
|
android:layout_marginStart="@dimen/tweet_icon_margin"
|
||||||
|
android:layout_marginLeft="@dimen/tweet_icon_margin"
|
||||||
android:contentDescription="@string/image_preview"
|
android:contentDescription="@string/image_preview"
|
||||||
android:visibility="invisible"
|
android:visibility="invisible"
|
||||||
app:srcCompat="@drawable/preview" />
|
app:srcCompat="@drawable/preview" />
|
||||||
|
|
Loading…
Reference in New Issue