Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-02 17:56:56 +01:00
Code Issues Releases Wiki Activity

fixed travis build problem

Browse Source 
added suspended message
This commit is contained in:
Mariotaku Lee 2016-06-21 12:49:22 +08:00
parent 7abc7fdb84
commit 3d99ead56c
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -24,7 +24,7 @@ android:
sudo: false sudo: false
jdk: jdk:
- openjdk8 - oraclejdk8
env: env:
global: global:

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

@ -1004,11 +1004,13 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
quoteIndicator.setVisibility(View.VISIBLE); quoteIndicator.setVisibility(View.VISIBLE);
boolean originalIdAvailable = !TextUtils.isEmpty(status.quoted_id);
boolean quoteContentAvailable = status.quoted_text_plain != null boolean quoteContentAvailable = status.quoted_text_plain != null
&& status.quoted_text_unescaped != null; && status.quoted_text_unescaped != null;
quoteOriginalLink.setVisibility(originalIdAvailable ? View.VISIBLE : View.GONE);
if (quoteContentAvailable) { if (quoteContentAvailable) {
quoteOriginalLink.setVisibility(View.VISIBLE);
quotedNameView.setVisibility(View.VISIBLE); quotedNameView.setVisibility(View.VISIBLE);
quotedTextView.setVisibility(View.VISIBLE); quotedTextView.setVisibility(View.VISIBLE);
@ -1041,7 +1043,6 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
quoteIndicator.setColor(status.quoted_user_color); quoteIndicator.setColor(status.quoted_user_color);
} else { } else {
quoteOriginalLink.setVisibility(View.GONE);
quotedNameView.setVisibility(View.GONE); quotedNameView.setVisibility(View.GONE);
quotedTextView.setVisibility(View.VISIBLE); quotedTextView.setVisibility(View.VISIBLE);

1
twidere/src/main/java/org/mariotaku/twidere/util/StatusCodeMessageUtils.java
View File

@ -50,6 +50,7 @@ public class StatusCodeMessageUtils {
TWITTER_ERROR_CODE_MESSAGES.put(ErrorInfo.STATUS_IS_DUPLICATE, R.string.error_twitter_187); TWITTER_ERROR_CODE_MESSAGES.put(ErrorInfo.STATUS_IS_DUPLICATE, R.string.error_twitter_187);
TWITTER_ERROR_CODE_MESSAGES.put(193, R.string.error_twitter_193); TWITTER_ERROR_CODE_MESSAGES.put(193, R.string.error_twitter_193);
TWITTER_ERROR_CODE_MESSAGES.put(215, R.string.error_twitter_215); TWITTER_ERROR_CODE_MESSAGES.put(215, R.string.error_twitter_215);
TWITTER_ERROR_CODE_MESSAGES.put(326, R.string.error_twitter_326);
HTTP_STATUS_CODE_MESSAGES.put(407, R.string.error_http_407); HTTP_STATUS_CODE_MESSAGES.put(407, R.string.error_http_407);
} }

1
twidere/src/main/res/values/strings_twitter_errors.xml
View File

@ -34,5 +34,6 @@
<string name="error_twitter_193">The photo you upload is too large.</string> <string name="error_twitter_193">The photo you upload is too large.</string>
<!-- 215 Bad authentication data: Typically sent with 1.1 responses with HTTP code 400. The method requires authentication but it was not presented or was wholly invalid --> <!-- 215 Bad authentication data: Typically sent with 1.1 responses with HTTP code 400. The method requires authentication but it was not presented or was wholly invalid -->
<string name="error_twitter_215">You may need to sign in again.</string> <string name="error_twitter_215">You may need to sign in again.</string>
<string name="error_twitter_326">Your account was suspended, please visit https://twitter.com/ for details.</string>
</resources> </resources>