Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into new_api

This commit is contained in:
Mariotaku Lee 2015-05-08 13:36:09 +08:00
parent 9a9852d394 2ee8864652
commit 8c110aeced
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
twidere/src/main/java/org/mariotaku/twidere/fragment/support/DraftsFragment.java
View File

@ -353,15 +353,10 @@ public class DraftsFragment extends BaseSupportFragment implements Constants, Lo
@Override
protected void onPreExecute() {
super.onPreExecute();
mHandler.post(new Runnable() {
@Override
public void run() {
final SupportProgressDialogFragment f = SupportProgressDialogFragment.show(mActivity,
FRAGMENT_TAG_DELETING_DRAFTS);
f.setCancelable(false);
}
});
}
@Override
protected void onPostExecute(final Integer result) {

3
twidere/src/main/java/org/mariotaku/twidere/fragment/support/StatusFragment.java
View File

@ -754,7 +754,6 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
profileTypeView.setVisibility(View.GONE);
}
// TODO Handle source click
final String timeString = Utils.formatToLongTimeString(context, timestamp);
if (!TextUtils.isEmpty(timeString) && !TextUtils.isEmpty(source)) {
timeSourceView.setText(Html.fromHtml(context.getString(R.string.time_source, timeString, source)));
@ -763,7 +762,7 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
} else if (!TextUtils.isEmpty(timeString) && TextUtils.isEmpty(source)) {
timeSourceView.setText(timeString);
}
timeSourceView.setMovementMethod(null);
timeSourceView.setMovementMethod(StatusContentMovementMethod.getInstance());
textView.setText(Html.fromHtml(status.text_html));
linkify.applyAllLinks(textView, status.account_id, layoutPosition, status.is_possibly_sensitive);