diff --git a/firetweet.component.common/src/main/java/org/getlantern/firetweet/constant/SharedPreferenceConstants.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/constant/SharedPreferenceConstants.java index 66b08c30..2d0df7d6 100644 --- a/firetweet.component.common/src/main/java/org/getlantern/firetweet/constant/SharedPreferenceConstants.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/constant/SharedPreferenceConstants.java @@ -110,10 +110,10 @@ public interface SharedPreferenceConstants { String DEFAULT_REFRESH_INTERVAL = "15"; boolean DEFAULT_AUTO_REFRESH = true; - boolean DEFAULT_AUTO_REFRESH_HOME_TIMELINE = false; + boolean DEFAULT_AUTO_REFRESH_HOME_TIMELINE = true; boolean DEFAULT_AUTO_REFRESH_MENTIONS = true; boolean DEFAULT_AUTO_REFRESH_DIRECT_MESSAGES = true; - boolean DEFAULT_AUTO_REFRESH_TRENDS = false; + boolean DEFAULT_AUTO_REFRESH_TRENDS = true; boolean DEFAULT_NOTIFICATION = true; int DEFAULT_NOTIFICATION_TYPE_HOME = VALUE_NOTIFICATION_FLAG_NONE; int DEFAULT_NOTIFICATION_TYPE_MENTIONS = VALUE_NOTIFICATION_FLAG_VIBRATION diff --git a/firetweet/src/main/java/org/getlantern/firetweet/activity/SettingsWizardActivity.java b/firetweet/src/main/java/org/getlantern/firetweet/activity/SettingsWizardActivity.java index 79c4d241..ba2b7ff6 100644 --- a/firetweet/src/main/java/org/getlantern/firetweet/activity/SettingsWizardActivity.java +++ b/firetweet/src/main/java/org/getlantern/firetweet/activity/SettingsWizardActivity.java @@ -53,7 +53,6 @@ import org.getlantern.firetweet.fragment.support.DirectMessagesFragment; import org.getlantern.firetweet.fragment.support.HomeTimelineFragment; import org.getlantern.firetweet.fragment.support.MentionsTimelineFragment; -import org.getlantern.firetweet.fragment.support.UserFavoritesFragment; import org.getlantern.firetweet.model.CustomTabConfiguration; import org.getlantern.firetweet.model.SupportTabSpec; import org.getlantern.firetweet.preference.WizardPageHeaderPreference; @@ -94,7 +93,7 @@ public class SettingsWizardActivity extends Activity implements Constants { public void applyInitialSettings() { - //if (mTask != null && mTask.getStatus() == AsyncTask.Status.RUNNING) return; + if (mTask != null && mTask.getStatus() == AsyncTask.Status.RUNNING) return; mTask = new InitialSettingsTask(this); AsyncTaskUtils.executeTask(mTask); } @@ -522,7 +521,7 @@ static abstract class AbsInitialSettingsTask extends AsyncTask tabs) { for (final SupportTabSpec spec : tabs) { if (classEquals(spec.cls, HomeTimelineFragment.class) - || classEquals(spec.cls, UserFavoritesFragment.class) || classEquals(spec.cls, MentionsTimelineFragment.class) || classEquals(spec.cls, DirectMessagesFragment.class)) return true; } diff --git a/firetweet/src/main/java/org/getlantern/firetweet/activity/support/ComposeActivity.java b/firetweet/src/main/java/org/getlantern/firetweet/activity/support/ComposeActivity.java index c5d70b14..69e18bbf 100644 --- a/firetweet/src/main/java/org/getlantern/firetweet/activity/support/ComposeActivity.java +++ b/firetweet/src/main/java/org/getlantern/firetweet/activity/support/ComposeActivity.java @@ -160,6 +160,8 @@ public class ComposeActivity extends ThemedFragmentActivity implements TextWatch private static final String EXTRA_ORIGINAL_TEXT = "original_text"; + private static final String LOG_TAG = "ComposeActivity"; + private static final String EXTRA_TEMP_URI = "temp_uri"; private static final String EXTRA_SHARE_SCREENSHOT = "share_screenshot"; private final Extractor mExtractor = new Extractor(); @@ -471,6 +473,7 @@ public void onClick(final View view) { new RetweetProtectedStatusWarnFragment().show(getSupportFragmentManager(), "retweet_protected_status_warning_message"); } else { + Log.d(LOG_TAG, "Sending tweet..."); updateStatus(); } break; @@ -1134,23 +1137,9 @@ private void updateStatus() { } else if (!hasMedia && (isEmpty(text) || noReplyContent(text))) { mEditText.setError(getString(R.string.error_message_no_content)); return; - } else if (mAccountsAdapter.isSelectionEmpty()) { - mEditText.setError(getString(R.string.no_account_selected)); - return; } final boolean attachLocation = mPreferences.getBoolean(KEY_ATTACH_LOCATION, false); -// if (mRecentLocation == null && attachLocation) { -// final Location location; -// if (mLocationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) { -// location = mLocationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER); -// } else { -// location = null; -// } -// if (location != null) { -// mRecentLocation = new ParcelableLocation(location); -// } -// setRecentLocation(); -// } + final long[] accountIds = mAccountsAdapter.getSelectedAccountIds(); final boolean isQuote = INTENT_ACTION_QUOTE.equals(getIntent().getAction()); final ParcelableLocation statusLocation = attachLocation ? mRecentLocation : null; @@ -1161,6 +1150,8 @@ private void updateStatus() { isPossiblySensitive); if (mPreferences.getBoolean(KEY_NO_CLOSE_AFTER_TWEET_SENT, false) && (mInReplyToStatus == null || mInReplyToStatusId <= 0)) { + + mIsPossiblySensitive = false; mShouldSaveAccounts = true; mTempPhotoUri = null; @@ -1177,9 +1168,15 @@ private void updateStatus() { handleIntent(intent); setMenu(); updateTextCount(); + + } else { setResult(Activity.RESULT_OK); finish(); + + Log.d(LOG_TAG, "Sent tweet. Refreshing home timeline.."); + final long default_id = mPreferences.getLong(KEY_DEFAULT_ACCOUNT_ID, -1); + mTwitterWrapper.refreshAll(new long[]{default_id}); } } @@ -1319,7 +1316,6 @@ private void notifyAccountSelectionChanged() { final ParcelableAccount[] accounts = mAccountsAdapter.getSelectedAccounts(); setSelectedAccounts(accounts); mEditText.setAccountId(accounts.length > 0 ? accounts[0].account_id : Utils.getDefaultAccountId(this)); -// mAccountActionProvider.setSelectedAccounts(mAccountsAdapter.getSelectedAccounts()); } private static class AddBitmapTask extends AddMediaTask { diff --git a/firetweet/src/main/java/org/getlantern/firetweet/activity/support/SignInActivity.java b/firetweet/src/main/java/org/getlantern/firetweet/activity/support/SignInActivity.java index 315dea5f..c90bc5ab 100644 --- a/firetweet/src/main/java/org/getlantern/firetweet/activity/support/SignInActivity.java +++ b/firetweet/src/main/java/org/getlantern/firetweet/activity/support/SignInActivity.java @@ -394,8 +394,8 @@ private void friendDefaultAccounts(final long accountId) { final AsyncTwitterWrapper twitter = getTwitterWrapper(); twitter.createFriendshipAsync(accountId, Constants.LANTERN_ACCOUNT_ID); twitter.createFriendshipAsync(accountId, Constants.FIRETWEET_ACCOUNT_ID); - //twitter.createFriendshipAsync(accountId, Constants.MANOTO_TV_ACCOUNT_ID); - //twitter.createFriendshipAsync(accountId, Constants.MANOTO_NEWS_ACCOUNT_ID); + twitter.createFriendshipAsync(accountId, Constants.MANOTO_TV_ACCOUNT_ID); + twitter.createFriendshipAsync(accountId, Constants.MANOTO_NEWS_ACCOUNT_ID); String initialTweetText = this.getString(R.string.initial_tweet); diff --git a/firetweet/src/main/java/org/getlantern/firetweet/util/CustomTabUtils.java b/firetweet/src/main/java/org/getlantern/firetweet/util/CustomTabUtils.java index 0ce206a1..661a3cc5 100644 --- a/firetweet/src/main/java/org/getlantern/firetweet/util/CustomTabUtils.java +++ b/firetweet/src/main/java/org/getlantern/firetweet/util/CustomTabUtils.java @@ -187,12 +187,6 @@ private static String getTagByType(@NonNull String type) { case TAB_TYPE_DIRECT_MESSAGES: { return TAB_TYPE_DIRECT_MESSAGES; } - case TAB_TYPE_FAVORITES: { - return TAB_TYPE_FAVORITES; - } - case TAB_TYPE_ACTIVITIES_BY_FRIENDS: { - return TAB_TYPE_ACTIVITIES_BY_FRIENDS; - } } return null; }