From fb9969f98b078f6043b8c47f6f16ecf883d78db3 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Sun, 27 Mar 2016 23:35:55 +0800 Subject: [PATCH] fixed twitlonger extension package name fixed text count --- twidere.extension.twitlonger/build.gradle | 2 +- .../org/mariotaku/twidere/activity/ComposeActivity.java | 2 +- .../org/mariotaku/twidere/util/ReadStateManager.java | 9 --------- .../org/mariotaku/twidere/view/StatusTextCountView.java | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/twidere.extension.twitlonger/build.gradle b/twidere.extension.twitlonger/build.gradle index 052678937..e67a7aa9c 100644 --- a/twidere.extension.twitlonger/build.gradle +++ b/twidere.extension.twitlonger/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'com.neenbedankt.android-apt' android { defaultConfig { - applicationId "org.mariotaku.extension.twitlonger" + applicationId "org.mariotaku.twidere.extension.twitlonger" minSdkVersion 14 targetSdkVersion 23 versionCode 7 diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/ComposeActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/ComposeActivity.java index d960d0501..db6f55dc2 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/activity/ComposeActivity.java +++ b/twidere/src/main/java/org/mariotaku/twidere/activity/ComposeActivity.java @@ -1423,7 +1423,7 @@ public class ComposeActivity extends BaseActivity implements OnMenuItemClickList } else if (!hasMedia && (TextUtils.isEmpty(text) || noReplyContent(text))) { mEditText.setError(getString(R.string.error_message_no_content)); return; - } else if (!mStatusShortenerUsed && tweetLength > maxLength) { + } else if (maxLength <= 0 || (!mStatusShortenerUsed && tweetLength > maxLength)) { mEditText.setError(getString(R.string.error_message_status_too_long)); final int textLength = mEditText.length(); mEditText.setSelection(textLength - (tweetLength - maxLength), textLength); diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/ReadStateManager.java b/twidere/src/main/java/org/mariotaku/twidere/util/ReadStateManager.java index 209bdd881..7005d37f4 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/ReadStateManager.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/ReadStateManager.java @@ -66,11 +66,6 @@ public class ReadStateManager implements Constants { return pairs; } - - public long getPosition(final String key, final long keyId) { - return getPosition(key, String.valueOf(keyId)); - } - public long getPosition(final String key, final String keyId) { if (TextUtils.isEmpty(key)) return -1; final Set set = mPreferences.getStringSet(key, null); @@ -95,10 +90,6 @@ public class ReadStateManager implements Constants { } - public boolean setPosition(final String key, final long keyId, final long position, boolean acceptOlder) { - return setPosition(key, String.valueOf(keyId), position, acceptOlder); - } - public boolean setPosition(final String key, final String keyId, final long position, boolean acceptOlder) { if (TextUtils.isEmpty(key)) return false; Set set = mPreferences.getStringSet(key, null); diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/StatusTextCountView.java b/twidere/src/main/java/org/mariotaku/twidere/view/StatusTextCountView.java index d81c6ecea..9e1c5cc57 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/StatusTextCountView.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/StatusTextCountView.java @@ -82,7 +82,7 @@ public class StatusTextCountView extends AppCompatTextView { } public void updateTextCount() { - if (mMaxLength < 0) { + if (mMaxLength <= 0) { setText(null); return; }