diff --git a/twidere.component.common/.gitignore b/firetweet.component.common/.gitignore similarity index 100% rename from twidere.component.common/.gitignore rename to firetweet.component.common/.gitignore diff --git a/twidere.component.common/build.gradle b/firetweet.component.common/build.gradle similarity index 86% rename from twidere.component.common/build.gradle rename to firetweet.component.common/build.gradle index 330b0557..ec6078cd 100644 --- a/twidere.component.common/build.gradle +++ b/firetweet.component.common/build.gradle @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -38,8 +38,8 @@ android { dependencies { compile 'com.android.support:support-annotations:22.0.0' compile 'org.apache.commons:commons-lang3:3.4' - compile project(':twidere.component.jsonserializer') - compile project(':twidere.component.querybuilder') - compile project(':twidere.component.twitter4j') + compile project(':firetweet.component.jsonserializer') + compile project(':firetweet.component.querybuilder') + compile project(':firetweet.component.twitter4j') compile fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/twidere.component.common/proguard-rules.pro b/firetweet.component.common/proguard-rules.pro similarity index 100% rename from twidere.component.common/proguard-rules.pro rename to firetweet.component.common/proguard-rules.pro diff --git a/twidere.component.common/src/androidTest/java/org/mariotaku/twidere/common/ApplicationTest.java b/firetweet.component.common/src/androidTest/java/org/getlantern/firetweet/common/ApplicationTest.java similarity index 92% rename from twidere.component.common/src/androidTest/java/org/mariotaku/twidere/common/ApplicationTest.java rename to firetweet.component.common/src/androidTest/java/org/getlantern/firetweet/common/ApplicationTest.java index fff2ae95..4533f78e 100644 --- a/twidere.component.common/src/androidTest/java/org/mariotaku/twidere/common/ApplicationTest.java +++ b/firetweet.component.common/src/androidTest/java/org/getlantern/firetweet/common/ApplicationTest.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.common; +package org.getlantern.firetweet.common; import android.app.Application; import android.test.ApplicationTestCase; @@ -29,4 +29,4 @@ public class ApplicationTest extends ApplicationTestCase { public ApplicationTest() { super(Application.class); } -} \ No newline at end of file +} diff --git a/twidere.component.common/src/main/AndroidManifest.xml b/firetweet.component.common/src/main/AndroidManifest.xml similarity index 88% rename from twidere.component.common/src/main/AndroidManifest.xml rename to firetweet.component.common/src/main/AndroidManifest.xml index 0bc2fff8..afdbcf75 100644 --- a/twidere.component.common/src/main/AndroidManifest.xml +++ b/firetweet.component.common/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/IMediaUploader.aidl b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/IMediaUploader.aidl similarity index 76% rename from twidere.component.common/src/main/aidl/org/mariotaku/twidere/IMediaUploader.aidl rename to firetweet.component.common/src/main/aidl/org/getlantern/firetweet/IMediaUploader.aidl index 6dc1fe01..311a0918 100644 --- a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/IMediaUploader.aidl +++ b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/IMediaUploader.aidl @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2013 Mariotaku Lee * @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mariotaku.twidere; +package org.getlantern.firetweet; -import org.mariotaku.twidere.model.MediaUploadResult; -import org.mariotaku.twidere.model.ParcelableStatusUpdate; -import org.mariotaku.twidere.model.UploaderMediaItem; +import org.getlantern.firetweet.model.MediaUploadResult; +import org.getlantern.firetweet.model.ParcelableStatusUpdate; +import org.getlantern.firetweet.model.UploaderMediaItem; interface IMediaUploader { diff --git a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/IStatusShortener.aidl b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/IStatusShortener.aidl similarity index 81% rename from twidere.component.common/src/main/aidl/org/mariotaku/twidere/IStatusShortener.aidl rename to firetweet.component.common/src/main/aidl/org/getlantern/firetweet/IStatusShortener.aidl index 731a88a2..410c41ed 100644 --- a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/IStatusShortener.aidl +++ b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/IStatusShortener.aidl @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2013 Mariotaku Lee * @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mariotaku.twidere; +package org.getlantern.firetweet; -import org.mariotaku.twidere.model.ParcelableStatusUpdate; -import org.mariotaku.twidere.model.StatusShortenResult; +import org.getlantern.firetweet.model.ParcelableStatusUpdate; +import org.getlantern.firetweet.model.StatusShortenResult; interface IStatusShortener { diff --git a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/ITimelineSyncHelper.aidl b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/ITimelineSyncHelper.aidl similarity index 87% rename from twidere.component.common/src/main/aidl/org/mariotaku/twidere/ITimelineSyncHelper.aidl rename to firetweet.component.common/src/main/aidl/org/getlantern/firetweet/ITimelineSyncHelper.aidl index ad6c5cb4..f3290a0c 100644 --- a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/ITimelineSyncHelper.aidl +++ b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/ITimelineSyncHelper.aidl @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2013 Mariotaku Lee * @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mariotaku.twidere; +package org.getlantern.firetweet; -import org.mariotaku.twidere.model.Account; +import org.getlantern.firetweet.model.Account; interface ITimelineSyncHelper { diff --git a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/Account.aidl b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/Account.aidl similarity index 89% rename from twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/Account.aidl rename to firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/Account.aidl index 32d5536c..ad706080 100644 --- a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/Account.aidl +++ b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/Account.aidl @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2014 Mariotaku Lee * @@ -17,6 +17,6 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; parcelable Account; diff --git a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/MediaUploadResult.aidl b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/MediaUploadResult.aidl similarity index 86% rename from twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/MediaUploadResult.aidl rename to firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/MediaUploadResult.aidl index a695fddf..406d36f2 100644 --- a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/MediaUploadResult.aidl +++ b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/MediaUploadResult.aidl @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2014 Mariotaku Lee * @@ -17,6 +17,6 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; -parcelable MediaUploadResult; \ No newline at end of file +parcelable MediaUploadResult; diff --git a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/MediaUploaderParameter.aidl b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/MediaUploaderParameter.aidl similarity index 85% rename from twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/MediaUploaderParameter.aidl rename to firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/MediaUploaderParameter.aidl index c34485f6..f203d456 100644 --- a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/MediaUploaderParameter.aidl +++ b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/MediaUploaderParameter.aidl @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2014 Mariotaku Lee * @@ -17,6 +17,6 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; -parcelable MediaUploaderParameter; \ No newline at end of file +parcelable MediaUploaderParameter; diff --git a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/ParcelableLocation.aidl b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/ParcelableLocation.aidl similarity index 89% rename from twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/ParcelableLocation.aidl rename to firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/ParcelableLocation.aidl index c55d019e..f87d3bda 100644 --- a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/ParcelableLocation.aidl +++ b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/ParcelableLocation.aidl @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012 Mariotaku Lee * @@ -17,6 +17,6 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; parcelable ParcelableLocation; diff --git a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/ParcelableStatus.aidl b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/ParcelableStatus.aidl similarity index 89% rename from twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/ParcelableStatus.aidl rename to firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/ParcelableStatus.aidl index d124d4c6..c74ce034 100644 --- a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/ParcelableStatus.aidl +++ b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/ParcelableStatus.aidl @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2014 Mariotaku Lee * @@ -17,6 +17,6 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; parcelable ParcelableStatus; diff --git a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/ParcelableStatusUpdate.aidl b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/ParcelableStatusUpdate.aidl similarity index 89% rename from twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/ParcelableStatusUpdate.aidl rename to firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/ParcelableStatusUpdate.aidl index 5eda3b5e..494f40a8 100644 --- a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/ParcelableStatusUpdate.aidl +++ b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/ParcelableStatusUpdate.aidl @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2014 Mariotaku Lee * @@ -17,6 +17,6 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; parcelable ParcelableStatusUpdate; diff --git a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/StatusShortenResult.aidl b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/StatusShortenResult.aidl similarity index 86% rename from twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/StatusShortenResult.aidl rename to firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/StatusShortenResult.aidl index 881f84d4..cc61a431 100644 --- a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/StatusShortenResult.aidl +++ b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/StatusShortenResult.aidl @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2014 Mariotaku Lee * @@ -17,6 +17,6 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; -parcelable StatusShortenResult; \ No newline at end of file +parcelable StatusShortenResult; diff --git a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/UploaderMediaItem.aidl b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/UploaderMediaItem.aidl similarity index 86% rename from twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/UploaderMediaItem.aidl rename to firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/UploaderMediaItem.aidl index e5bab16c..4c2788bc 100644 --- a/twidere.component.common/src/main/aidl/org/mariotaku/twidere/model/UploaderMediaItem.aidl +++ b/firetweet.component.common/src/main/aidl/org/getlantern/firetweet/model/UploaderMediaItem.aidl @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2014 Mariotaku Lee * @@ -17,6 +17,6 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; -parcelable UploaderMediaItem; \ No newline at end of file +parcelable UploaderMediaItem; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/FiretweetConstants.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/FiretweetConstants.java index cd876a31..54800d56 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/FiretweetConstants.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,20 +17,20 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere; +package org.getlantern.firetweet; -import org.mariotaku.twidere.constant.IntentConstants; -import org.mariotaku.twidere.constant.SharedPreferenceConstants; +import org.getlantern.firetweet.constant.IntentConstants; +import org.getlantern.firetweet.constant.SharedPreferenceConstants; /** - * Public constants for both Twidere app and its extensions + * Public constants for both Firetweet app and its extensions * * @author mariotaku */ -public interface TwidereConstants extends SharedPreferenceConstants, IntentConstants { +public interface FiretweetConstants extends SharedPreferenceConstants, IntentConstants { public static final String APP_NAME = "FireTweet"; - public static final String APP_PACKAGE_NAME = "org.mariotaku.twidere"; + public static final String APP_PACKAGE_NAME = "org.getlantern.firetweet"; public static final String APP_PROJECT_URL = "https://github.com/getlantern/firetweet"; public static final String APP_PROJECT_EMAIL = "firetweet@getlantern.org"; @@ -210,11 +210,11 @@ public interface TwidereConstants extends SharedPreferenceConstants, IntentConst public static final String SERVICE_COMMAND_GET_SENT_DIRECT_MESSAGES = "get_sent_direct_messages"; public static final String SERVICE_COMMAND_GET_RECEIVED_DIRECT_MESSAGES = "get_received_direct_messages"; - public static final String METADATA_KEY_EXTENSION = "org.mariotaku.twidere.extension"; - public static final String METADATA_KEY_EXTENSION_PERMISSIONS = "org.mariotaku.twidere.extension.permissions"; - public static final String METADATA_KEY_EXTENSION_SETTINGS = "org.mariotaku.twidere.extension.settings"; - public static final String METADATA_KEY_EXTENSION_ICON = "org.mariotaku.twidere.extension.icon"; - public static final String METADATA_KEY_EXTENSION_USE_JSON = "org.mariotaku.twidere.extension.use_json"; + public static final String METADATA_KEY_EXTENSION = "org.getlantern.firetweet.extension"; + public static final String METADATA_KEY_EXTENSION_PERMISSIONS = "org.getlantern.firetweet.extension.permissions"; + public static final String METADATA_KEY_EXTENSION_SETTINGS = "org.getlantern.firetweet.extension.settings"; + public static final String METADATA_KEY_EXTENSION_ICON = "org.getlantern.firetweet.extension.icon"; + public static final String METADATA_KEY_EXTENSION_USE_JSON = "org.getlantern.firetweet.extension.use_json"; public static final char SEPARATOR_PERMISSION = '|'; public static final String SEPARATOR_PERMISSION_REGEX = "\\" + SEPARATOR_PERMISSION; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/Preference.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/annotation/Preference.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/Preference.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/annotation/Preference.java index 1fa447e3..f66bb6aa 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/Preference.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/annotation/Preference.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.annotation; +package org.getlantern.firetweet.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/IntentConstants.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/constant/IntentConstants.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/constant/IntentConstants.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/constant/IntentConstants.java index fd4c80f8..0455b205 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/IntentConstants.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/constant/IntentConstants.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.constant; +package org.getlantern.firetweet.constant; public interface IntentConstants { - public static final String INTENT_PACKAGE_PREFIX = "org.mariotaku.twidere."; + public static final String INTENT_PACKAGE_PREFIX = "org.getlantern.firetweet."; public static final String INTENT_ACTION_HOME = INTENT_PACKAGE_PREFIX + "HOME"; public static final String INTENT_ACTION_COMPOSE = INTENT_PACKAGE_PREFIX + "COMPOSE"; @@ -71,7 +71,7 @@ public interface IntentConstants { public static final String INTENT_ACTION_UPDATE_STATUS = INTENT_PACKAGE_PREFIX + "UPDATE_STATUS"; public static final String INTENT_ACTION_SEND_DIRECT_MESSAGE = INTENT_PACKAGE_PREFIX + "SEND_DIRECT_MESSAGE"; public static final String INTENT_ACTION_DISCARD_DRAFT = INTENT_PACKAGE_PREFIX + "DISCARD_DRAFT"; - public static final String INTENT_ACTION_PICK_ACTIVITY = "org.mariotaku.twidere.PICK_ACTIVITY"; + public static final String INTENT_ACTION_PICK_ACTIVITY = "org.getlantern.firetweet.PICK_ACTIVITY"; public static final String INTENT_ACTION_PEBBLE_NOTIFICATION = "com.getpebble.action.SEND_NOTIFICATION"; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/SharedPreferenceConstants.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/constant/SharedPreferenceConstants.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/constant/SharedPreferenceConstants.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/constant/SharedPreferenceConstants.java index 68ef5e35..e72490b9 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/SharedPreferenceConstants.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/constant/SharedPreferenceConstants.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,16 +17,16 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.constant; +package org.getlantern.firetweet.constant; -import org.mariotaku.twidere.TwidereConstants; -import org.mariotaku.twidere.annotation.Preference; -import org.mariotaku.twidere.provider.TwidereDataStore.Accounts; +import org.getlantern.firetweet.FiretweetConstants; +import org.getlantern.firetweet.annotation.Preference; +import org.getlantern.firetweet.provider.FiretweetDataStore.Accounts; -import static org.mariotaku.twidere.annotation.Preference.Type.BOOLEAN; -import static org.mariotaku.twidere.annotation.Preference.Type.INT; -import static org.mariotaku.twidere.annotation.Preference.Type.LONG; -import static org.mariotaku.twidere.annotation.Preference.Type.STRING; +import static org.getlantern.firetweet.annotation.Preference.Type.BOOLEAN; +import static org.getlantern.firetweet.annotation.Preference.Type.INT; +import static org.getlantern.firetweet.annotation.Preference.Type.LONG; +import static org.getlantern.firetweet.annotation.Preference.Type.STRING; public interface SharedPreferenceConstants { @@ -251,9 +251,9 @@ public interface SharedPreferenceConstants { String KEY_NO_VERSION_SUFFIX = "no_version_suffix"; @Preference(type = INT, hasDefault = true, defaultInt = Accounts.AUTH_TYPE_OAUTH) String KEY_AUTH_TYPE = "auth_type"; - @Preference(type = STRING, hasDefault = true, defaultString = TwidereConstants.TWITTER_CONSUMER_KEY_3) + @Preference(type = STRING, hasDefault = true, defaultString = FiretweetConstants.TWITTER_CONSUMER_KEY_3) String KEY_CONSUMER_KEY = "consumer_key"; - @Preference(type = STRING, hasDefault = true, defaultString = TwidereConstants.TWITTER_CONSUMER_SECRET_3) + @Preference(type = STRING, hasDefault = true, defaultString = FiretweetConstants.TWITTER_CONSUMER_SECRET_3) String KEY_CONSUMER_SECRET = "consumer_secret"; String KEY_SETTINGS_WIZARD_COMPLETED = "settings_wizard_completed"; @Preference(type = BOOLEAN, hasDefault = true, defaultBoolean = true) diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/DraftItem.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/DraftItem.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/DraftItem.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/DraftItem.java index 45c47068..bdbc271f 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/DraftItem.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/DraftItem.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.database.Cursor; import android.os.Parcel; @@ -26,8 +26,8 @@ import org.json.JSONException; import org.json.JSONObject; -import org.mariotaku.twidere.provider.TwidereDataStore.Drafts; -import org.mariotaku.twidere.util.TwidereArrayUtils; +import org.getlantern.firetweet.provider.FiretweetDataStore.Drafts; +import org.getlantern.firetweet.util.FiretweetArrayUtils; public class DraftItem implements Parcelable { @@ -56,7 +56,7 @@ public DraftItem(final Cursor cursor, final CursorIndices indices) { _id = cursor.getLong(indices._id); text = cursor.getString(indices.text); media = ParcelableMediaUpdate.fromJSONString(cursor.getString(indices.media)); - account_ids = TwidereArrayUtils.parseLongArray(cursor.getString(indices.account_ids), ','); + account_ids = FiretweetArrayUtils.parseLongArray(cursor.getString(indices.account_ids), ','); in_reply_to_status_id = cursor.getLong(indices.in_reply_to_status_id); is_possibly_sensitive = cursor.getShort(indices.is_possibly_sensitive) == 1; location = new ParcelableLocation(cursor.getString(indices.location)); diff --git a/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/FiretweetParcelable.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/FiretweetParcelable.java new file mode 100644 index 00000000..347c5f80 --- /dev/null +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/FiretweetParcelable.java @@ -0,0 +1,9 @@ +package org.getlantern.firetweet.model; + +import android.os.Parcelable; + +import org.getlantern.firetweetserializer.JSONParcelable; + +public interface FiretweetParcelable extends Parcelable, JSONParcelable { + +} diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/MediaUploadResult.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/MediaUploadResult.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/MediaUploadResult.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/MediaUploadResult.java index 8deee16c..040fca53 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/MediaUploadResult.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/MediaUploadResult.java @@ -1,4 +1,4 @@ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableAccount.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableAccount.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableAccount.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableAccount.java index 34a62ff6..e4105adf 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableAccount.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableAccount.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.content.Context; import android.database.Cursor; @@ -30,9 +30,9 @@ import org.mariotaku.querybuilder.Columns.Column; import org.mariotaku.querybuilder.Expression; import org.mariotaku.querybuilder.RawItemArray; -import org.mariotaku.twidere.provider.TwidereDataStore.Accounts; -import org.mariotaku.twidere.util.TwitterContentUtils; -import org.mariotaku.twidere.util.content.ContentResolverUtils; +import org.getlantern.firetweet.provider.FiretweetDataStore.Accounts; +import org.getlantern.firetweet.util.TwitterContentUtils; +import org.getlantern.firetweet.util.content.ContentResolverUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableDirectMessage.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableDirectMessage.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableDirectMessage.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableDirectMessage.java index 8223d794..48a6764d 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableDirectMessage.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableDirectMessage.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.content.ContentValues; import android.database.Cursor; @@ -25,9 +25,9 @@ import android.os.Parcelable; import android.support.annotation.NonNull; -import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages; -import org.mariotaku.twidere.util.SimpleValueSerializer; -import org.mariotaku.twidere.util.TwitterContentUtils; +import org.getlantern.firetweet.provider.FiretweetDataStore.DirectMessages; +import org.getlantern.firetweet.util.SimpleValueSerializer; +import org.getlantern.firetweet.util.TwitterContentUtils; import java.util.Comparator; import java.util.Date; @@ -35,9 +35,9 @@ import twitter4j.DirectMessage; import twitter4j.User; -import static org.mariotaku.twidere.util.HtmlEscapeHelper.toPlainText; -import static org.mariotaku.twidere.util.content.ContentValuesUtils.getAsBoolean; -import static org.mariotaku.twidere.util.content.ContentValuesUtils.getAsLong; +import static org.getlantern.firetweet.util.HtmlEscapeHelper.toPlainText; +import static org.getlantern.firetweet.util.content.ContentValuesUtils.getAsBoolean; +import static org.getlantern.firetweet.util.content.ContentValuesUtils.getAsLong; public class ParcelableDirectMessage implements Parcelable, Comparable { diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableLocation.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableLocation.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableLocation.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableLocation.java index 383b2a91..fac3605c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableLocation.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableLocation.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.location.Location; import android.os.Parcel; @@ -25,9 +25,9 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import org.mariotaku.jsonserializer.JSONParcel; -import org.mariotaku.jsonserializer.JSONParcelable; -import org.mariotaku.twidere.util.ParseUtils; +import org.getlantern.firetweetserializer.JSONParcel; +import org.getlantern.firetweetserializer.JSONParcelable; +import org.getlantern.firetweet.util.ParseUtils; import java.io.Serializable; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMedia.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableMedia.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMedia.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableMedia.java index b9437bf6..462ee774 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMedia.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableMedia.java @@ -1,18 +1,18 @@ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import org.mariotaku.jsonserializer.JSONParcel; -import org.mariotaku.jsonserializer.JSONParcelable; -import org.mariotaku.twidere.util.MediaPreviewUtils; -import org.mariotaku.twidere.util.SimpleValueSerializer; -import org.mariotaku.twidere.util.SimpleValueSerializer.Reader; -import org.mariotaku.twidere.util.SimpleValueSerializer.SerializationException; -import org.mariotaku.twidere.util.SimpleValueSerializer.SimpleValueSerializable; -import org.mariotaku.twidere.util.SimpleValueSerializer.Writer; +import org.getlantern.firetweetserializer.JSONParcel; +import org.getlantern.firetweetserializer.JSONParcelable; +import org.getlantern.firetweet.util.MediaPreviewUtils; +import org.getlantern.firetweet.util.SimpleValueSerializer; +import org.getlantern.firetweet.util.SimpleValueSerializer.Reader; +import org.getlantern.firetweet.util.SimpleValueSerializer.SerializationException; +import org.getlantern.firetweet.util.SimpleValueSerializer.SimpleValueSerializable; +import org.getlantern.firetweet.util.SimpleValueSerializer.Writer; import java.util.ArrayList; import java.util.Arrays; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMediaUpdate.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableMediaUpdate.java similarity index 90% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMediaUpdate.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableMediaUpdate.java index 2ac425df..2e189ed2 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMediaUpdate.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableMediaUpdate.java @@ -1,4 +1,4 @@ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.os.Parcel; import android.os.Parcelable; @@ -6,9 +6,9 @@ import org.json.JSONArray; import org.json.JSONException; -import org.mariotaku.jsonserializer.JSONParcel; -import org.mariotaku.jsonserializer.JSONParcelable; -import org.mariotaku.jsonserializer.JSONSerializer; +import org.getlantern.firetweetserializer.JSONParcel; +import org.getlantern.firetweetserializer.JSONParcelable; +import org.getlantern.firetweetserializer.JSONSerializer; public class ParcelableMediaUpdate implements Parcelable, JSONParcelable { @@ -85,4 +85,4 @@ public static ParcelableMediaUpdate[] fromJSONString(final String json) { } } -} \ No newline at end of file +} diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableStatus.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableStatus.java index 99af8dda..a7117b2b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableStatus.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.database.Cursor; import android.os.Parcel; @@ -28,13 +28,13 @@ import org.json.JSONException; import org.json.JSONObject; -import org.mariotaku.jsonserializer.JSONParcel; -import org.mariotaku.jsonserializer.JSONParcelable; -import org.mariotaku.jsonserializer.JSONSerializer; -import org.mariotaku.twidere.provider.TwidereDataStore.Statuses; -import org.mariotaku.twidere.util.HtmlEscapeHelper; -import org.mariotaku.twidere.util.SimpleValueSerializer; -import org.mariotaku.twidere.util.TwitterContentUtils; +import org.getlantern.firetweetserializer.JSONParcel; +import org.getlantern.firetweetserializer.JSONParcelable; +import org.getlantern.firetweetserializer.JSONSerializer; +import org.getlantern.firetweet.provider.FiretweetDataStore.Statuses; +import org.getlantern.firetweet.util.HtmlEscapeHelper; +import org.getlantern.firetweet.util.SimpleValueSerializer; +import org.getlantern.firetweet.util.TwitterContentUtils; import java.util.Arrays; import java.util.Comparator; @@ -51,7 +51,7 @@ import twitter4j.User; @SuppressWarnings("unused") -public class ParcelableStatus implements TwidereParcelable, Comparable { +public class ParcelableStatus implements FiretweetParcelable, Comparable { public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override @@ -689,7 +689,7 @@ public String toString() { } - public static final class ParcelableCardEntity implements TwidereParcelable { + public static final class ParcelableCardEntity implements FiretweetParcelable { public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override @@ -774,7 +774,7 @@ public static ParcelableValueItem getValue(ParcelableCardEntity entity, String k return null; } - public static final class ParcelableImageValue implements TwidereParcelable { + public static final class ParcelableImageValue implements FiretweetParcelable { public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override @@ -840,7 +840,7 @@ public void writeToParcel(JSONParcel dest) { } } - public static final class ParcelableUserValue implements TwidereParcelable { + public static final class ParcelableUserValue implements FiretweetParcelable { public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override @@ -895,7 +895,7 @@ public void writeToParcel(JSONParcel dest) { } } - public static final class ParcelableValueItem implements TwidereParcelable { + public static final class ParcelableValueItem implements FiretweetParcelable { public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableStatusUpdate.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableStatusUpdate.java index 2deac7c2..cfed0ae0 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatusUpdate.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableStatusUpdate.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.content.Context; import android.os.Parcel; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableUser.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableUser.java index 3fa00aac..7af4f1af 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableUser.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.content.ContentValues; import android.database.Cursor; @@ -26,18 +26,18 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import org.mariotaku.jsonserializer.JSONParcel; -import org.mariotaku.jsonserializer.JSONParcelable; -import org.mariotaku.twidere.provider.TwidereDataStore.CachedUsers; -import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages.ConversationEntries; -import org.mariotaku.twidere.util.HtmlEscapeHelper; -import org.mariotaku.twidere.util.ParseUtils; -import org.mariotaku.twidere.util.TwitterContentUtils; +import org.getlantern.firetweetserializer.JSONParcel; +import org.getlantern.firetweetserializer.JSONParcelable; +import org.getlantern.firetweet.provider.FiretweetDataStore.CachedUsers; +import org.getlantern.firetweet.provider.FiretweetDataStore.DirectMessages.ConversationEntries; +import org.getlantern.firetweet.util.HtmlEscapeHelper; +import org.getlantern.firetweet.util.ParseUtils; +import org.getlantern.firetweet.util.TwitterContentUtils; import twitter4j.URLEntity; import twitter4j.User; -public class ParcelableUser implements TwidereParcelable, Comparable { +public class ParcelableUser implements FiretweetParcelable, Comparable { public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserList.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableUserList.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserList.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableUserList.java index cee53702..8014921b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserList.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableUserList.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.NonNull; -import org.mariotaku.jsonserializer.JSONParcel; -import org.mariotaku.jsonserializer.JSONParcelable; +import org.getlantern.firetweetserializer.JSONParcel; +import org.getlantern.firetweetserializer.JSONParcelable; import twitter4j.User; import twitter4j.UserList; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserMention.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableUserMention.java similarity index 91% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserMention.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableUserMention.java index 502e3ad7..2e45e784 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUserMention.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/ParcelableUserMention.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.os.Parcel; import android.os.Parcelable; @@ -25,14 +25,14 @@ import org.json.JSONArray; import org.json.JSONException; -import org.mariotaku.jsonserializer.JSONParcel; -import org.mariotaku.jsonserializer.JSONParcelable; -import org.mariotaku.jsonserializer.JSONSerializer; -import org.mariotaku.twidere.util.SimpleValueSerializer; -import org.mariotaku.twidere.util.SimpleValueSerializer.Reader; -import org.mariotaku.twidere.util.SimpleValueSerializer.SerializationException; -import org.mariotaku.twidere.util.SimpleValueSerializer.SimpleValueSerializable; -import org.mariotaku.twidere.util.SimpleValueSerializer.Writer; +import org.getlantern.firetweetserializer.JSONParcel; +import org.getlantern.firetweetserializer.JSONParcelable; +import org.getlantern.firetweetserializer.JSONSerializer; +import org.getlantern.firetweet.util.SimpleValueSerializer; +import org.getlantern.firetweet.util.SimpleValueSerializer.Reader; +import org.getlantern.firetweet.util.SimpleValueSerializer.SerializationException; +import org.getlantern.firetweet.util.SimpleValueSerializer.SimpleValueSerializable; +import org.getlantern.firetweet.util.SimpleValueSerializer.Writer; import twitter4j.Status; import twitter4j.UserMentionEntity; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/StatusShortenResult.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/StatusShortenResult.java similarity index 97% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/StatusShortenResult.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/StatusShortenResult.java index 16e9ca55..b79557d6 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/StatusShortenResult.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/StatusShortenResult.java @@ -1,4 +1,4 @@ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/UploaderMediaItem.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/UploaderMediaItem.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/model/UploaderMediaItem.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/model/UploaderMediaItem.java index af4ea1f3..c3888257 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/UploaderMediaItem.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/model/UploaderMediaItem.java @@ -1,4 +1,4 @@ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.content.Context; import android.net.Uri; @@ -68,4 +68,4 @@ public static UploaderMediaItem[] getFromStatusUpdate(final Context context, fin return uploaderItems; } -} \ No newline at end of file +} diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/provider/FiretweetDataStore.java similarity index 99% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/provider/FiretweetDataStore.java index 5393fa9e..280d7a37 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/provider/TwidereDataStore.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/provider/FiretweetDataStore.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.provider; +package org.getlantern.firetweet.provider; import android.content.ContentResolver; import android.net.Uri; import android.provider.BaseColumns; @SuppressWarnings("unused") -public interface TwidereDataStore { +public interface FiretweetDataStore { String AUTHORITY = "twidere"; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/ContentValuesCreator.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/ContentValuesCreator.java similarity index 92% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/util/ContentValuesCreator.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/util/ContentValuesCreator.java index c739e8e3..4efa8c49 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/ContentValuesCreator.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/ContentValuesCreator.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,33 +17,33 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util; +package org.getlantern.firetweet.util; import android.content.ContentValues; import org.json.JSONException; import org.json.JSONObject; -import org.mariotaku.jsonserializer.JSONSerializer; -import org.mariotaku.twidere.TwidereConstants; -import org.mariotaku.twidere.model.ParcelableAccount; -import org.mariotaku.twidere.model.ParcelableDirectMessage; -import org.mariotaku.twidere.model.ParcelableLocation; -import org.mariotaku.twidere.model.ParcelableMedia; -import org.mariotaku.twidere.model.ParcelableMediaUpdate; -import org.mariotaku.twidere.model.ParcelableStatus; -import org.mariotaku.twidere.model.ParcelableStatus.ParcelableCardEntity; -import org.mariotaku.twidere.model.ParcelableStatusUpdate; -import org.mariotaku.twidere.model.ParcelableUser; -import org.mariotaku.twidere.model.ParcelableUserMention; -import org.mariotaku.twidere.provider.TwidereDataStore.Accounts; -import org.mariotaku.twidere.provider.TwidereDataStore.CachedRelationships; -import org.mariotaku.twidere.provider.TwidereDataStore.CachedTrends; -import org.mariotaku.twidere.provider.TwidereDataStore.CachedUsers; -import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages; -import org.mariotaku.twidere.provider.TwidereDataStore.Drafts; -import org.mariotaku.twidere.provider.TwidereDataStore.Filters; -import org.mariotaku.twidere.provider.TwidereDataStore.SavedSearches; -import org.mariotaku.twidere.provider.TwidereDataStore.Statuses; +import org.getlantern.firetweetserializer.JSONSerializer; +import org.getlantern.firetweet.FiretweetConstants; +import org.getlantern.firetweet.model.ParcelableAccount; +import org.getlantern.firetweet.model.ParcelableDirectMessage; +import org.getlantern.firetweet.model.ParcelableLocation; +import org.getlantern.firetweet.model.ParcelableMedia; +import org.getlantern.firetweet.model.ParcelableMediaUpdate; +import org.getlantern.firetweet.model.ParcelableStatus; +import org.getlantern.firetweet.model.ParcelableStatus.ParcelableCardEntity; +import org.getlantern.firetweet.model.ParcelableStatusUpdate; +import org.getlantern.firetweet.model.ParcelableUser; +import org.getlantern.firetweet.model.ParcelableUserMention; +import org.getlantern.firetweet.provider.FiretweetDataStore.Accounts; +import org.getlantern.firetweet.provider.FiretweetDataStore.CachedRelationships; +import org.getlantern.firetweet.provider.FiretweetDataStore.CachedTrends; +import org.getlantern.firetweet.provider.FiretweetDataStore.CachedUsers; +import org.getlantern.firetweet.provider.FiretweetDataStore.DirectMessages; +import org.getlantern.firetweet.provider.FiretweetDataStore.Drafts; +import org.getlantern.firetweet.provider.FiretweetDataStore.Filters; +import org.getlantern.firetweet.provider.FiretweetDataStore.SavedSearches; +import org.getlantern.firetweet.provider.FiretweetDataStore.Statuses; import java.util.ArrayList; import java.util.List; @@ -61,9 +61,9 @@ import twitter4j.auth.AccessToken; import twitter4j.conf.Configuration; -import static org.mariotaku.twidere.util.HtmlEscapeHelper.toPlainText; +import static org.getlantern.firetweet.util.HtmlEscapeHelper.toPlainText; -public final class ContentValuesCreator implements TwidereConstants { +public final class ContentValuesCreator implements FiretweetConstants { public static ContentValues createAccount(final Configuration conf, final String basicUsername, final String basicPassword, final User user, @@ -267,7 +267,7 @@ public static ContentValues createMessageDraft(final long accountId, final long final ContentValues values = new ContentValues(); values.put(Drafts.ACTION_TYPE, Drafts.ACTION_SEND_DIRECT_MESSAGE); values.put(Drafts.TEXT, text); - values.put(Drafts.ACCOUNT_IDS, TwidereArrayUtils.toString(new long[]{accountId}, ',', false)); + values.put(Drafts.ACCOUNT_IDS, FiretweetArrayUtils.toString(new long[]{accountId}, ',', false)); values.put(Drafts.TIMESTAMP, System.currentTimeMillis()); if (imageUri != null) { final ParcelableMediaUpdate[] mediaArray = {new ParcelableMediaUpdate(imageUri, 0)}; @@ -413,7 +413,7 @@ public static ContentValues createStatusDraft(final ParcelableStatusUpdate statu final ContentValues values = new ContentValues(); values.put(Drafts.ACTION_TYPE, Drafts.ACTION_UPDATE_STATUS); values.put(Drafts.TEXT, status.text); - values.put(Drafts.ACCOUNT_IDS, TwidereArrayUtils.toString(accountIds, ',', false)); + values.put(Drafts.ACCOUNT_IDS, FiretweetArrayUtils.toString(accountIds, ',', false)); values.put(Drafts.IN_REPLY_TO_STATUS_ID, status.in_reply_to_status_id); values.put(Drafts.LOCATION, ParcelableLocation.toString(status.location)); values.put(Drafts.IS_POSSIBLY_SENSITIVE, status.is_possibly_sensitive); diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/TwidereArrayUtils.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/FiretweetArrayUtils.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/util/TwidereArrayUtils.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/util/FiretweetArrayUtils.java index 9f9d11e7..cd47550b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/TwidereArrayUtils.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/FiretweetArrayUtils.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util; +package org.getlantern.firetweet.util; import android.support.annotation.NonNull; import android.text.TextUtils; @@ -27,9 +27,9 @@ import java.util.ArrayList; import java.util.List; -public final class TwidereArrayUtils { +public final class FiretweetArrayUtils { - private TwidereArrayUtils() { + private FiretweetArrayUtils() { throw new AssertionError("You are trying to create an instance for this utility class!"); } diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/HtmlBuilder.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/HtmlBuilder.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/util/HtmlBuilder.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/util/HtmlBuilder.java index cbaffe9a..631c556e 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/HtmlBuilder.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/HtmlBuilder.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util; +package org.getlantern.firetweet.util; import android.support.annotation.NonNull; @@ -27,9 +27,9 @@ import java.util.Locale; import static android.text.TextUtils.isEmpty; -import static org.mariotaku.twidere.util.HtmlEscapeHelper.escape; -import static org.mariotaku.twidere.util.HtmlEscapeHelper.toHtml; -import static org.mariotaku.twidere.util.HtmlEscapeHelper.unescape; +import static org.getlantern.firetweet.util.HtmlEscapeHelper.escape; +import static org.getlantern.firetweet.util.HtmlEscapeHelper.toHtml; +import static org.getlantern.firetweet.util.HtmlEscapeHelper.unescape; public class HtmlBuilder { diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/HtmlEscapeHelper.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/HtmlEscapeHelper.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/util/HtmlEscapeHelper.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/util/HtmlEscapeHelper.java index db9a57ed..1396e030 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/HtmlEscapeHelper.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/HtmlEscapeHelper.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util; +package org.getlantern.firetweet.util; import org.apache.commons.lang3.StringEscapeUtils; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/HtmlLinkExtractor.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/HtmlLinkExtractor.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/util/HtmlLinkExtractor.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/util/HtmlLinkExtractor.java index 23e62329..510912fc 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/HtmlLinkExtractor.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/HtmlLinkExtractor.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util; +package org.getlantern.firetweet.util; import java.util.Vector; import java.util.regex.Matcher; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/MediaPreviewUtils.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/MediaPreviewUtils.java similarity index 99% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/util/MediaPreviewUtils.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/util/MediaPreviewUtils.java index aa0bd5a0..f28bb8e6 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/MediaPreviewUtils.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/MediaPreviewUtils.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util; +package org.getlantern.firetweet.util; import org.json.JSONException; import org.json.JSONObject; -import org.mariotaku.twidere.model.ParcelableMedia; -import org.mariotaku.twidere.util.HtmlLinkExtractor.HtmlLink; +import org.getlantern.firetweet.model.ParcelableMedia; +import org.getlantern.firetweet.util.HtmlLinkExtractor.HtmlLink; import java.io.IOException; import java.util.ArrayList; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/ParseUtils.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/ParseUtils.java similarity index 93% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/util/ParseUtils.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/util/ParseUtils.java index ec6373f0..3f50f9c1 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/ParseUtils.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/ParseUtils.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util; +package org.getlantern.firetweet.util; import android.graphics.Color; import android.os.Bundle; @@ -25,8 +25,8 @@ import org.json.JSONException; import org.json.JSONObject; -import org.mariotaku.twidere.TwidereConstants; -import org.mariotaku.twidere.constant.IntentConstants; +import org.getlantern.firetweet.FiretweetConstants; +import org.getlantern.firetweet.constant.IntentConstants; import java.net.MalformedURLException; import java.net.URI; @@ -58,7 +58,7 @@ public static String bundleToJSON(final Bundle args) { } else if (value instanceof String) { json.put(key, args.getString(key)); } else { - Log.w(TwidereConstants.LOGTAG, "Unknown type " + value.getClass().getSimpleName() + " in arguments key " + key); + Log.w(FiretweetConstants.LOGTAG, "Unknown type " + value.getClass().getSimpleName() + " in arguments key " + key); } } catch (final JSONException e) { e.printStackTrace(); @@ -94,7 +94,7 @@ public static Bundle jsonToBundle(final String string) { } else if (value instanceof String) { bundle.putString(key, json.optString(key)); } else { - Log.w(TwidereConstants.LOGTAG, "Unknown type " + value.getClass().getSimpleName() + " in arguments key " + key); + Log.w(FiretweetConstants.LOGTAG, "Unknown type " + value.getClass().getSimpleName() + " in arguments key " + key); } } } catch (final JSONException e) { diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/RegexUtils.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/RegexUtils.java similarity index 95% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/util/RegexUtils.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/util/RegexUtils.java index 99cd0d9c..9422b9c0 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/RegexUtils.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/RegexUtils.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util; +package org.getlantern.firetweet.util; import java.util.regex.Matcher; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/SimpleValueSerializer.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/SimpleValueSerializer.java similarity index 98% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/util/SimpleValueSerializer.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/util/SimpleValueSerializer.java index a81d5802..a56c739e 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/SimpleValueSerializer.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/SimpleValueSerializer.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util; +package org.getlantern.firetweet.util; import android.util.Log; -import org.mariotaku.twidere.TwidereConstants; +import org.getlantern.firetweet.FiretweetConstants; import java.io.IOException; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/TwitterContentUtils.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/TwitterContentUtils.java similarity index 96% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/util/TwitterContentUtils.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/util/TwitterContentUtils.java index 0633a912..73a2684b 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/TwitterContentUtils.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/TwitterContentUtils.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util; +package org.getlantern.firetweet.util; import android.content.Context; import android.support.annotation.NonNull; -import org.mariotaku.twidere.common.R; +import org.getlantern.firetweet.common.R; import java.nio.charset.Charset; import java.util.zip.CRC32; @@ -35,7 +35,7 @@ import twitter4j.User; import twitter4j.UserMentionEntity; -import static org.mariotaku.twidere.util.HtmlEscapeHelper.toPlainText; +import static org.getlantern.firetweet.util.HtmlEscapeHelper.toPlainText; /** * Created by mariotaku on 15/1/11. diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/content/ContentResolverUtils.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/content/ContentResolverUtils.java similarity index 91% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/util/content/ContentResolverUtils.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/util/content/ContentResolverUtils.java index 2b016091..7757abe0 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/content/ContentResolverUtils.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/content/ContentResolverUtils.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util.content; +package org.getlantern.firetweet.util.content; import android.annotation.TargetApi; import android.content.ContentResolver; @@ -27,7 +27,7 @@ import android.os.Build; import android.os.CancellationSignal; -import org.mariotaku.twidere.util.TwidereArrayUtils; +import org.getlantern.firetweet.util.FiretweetArrayUtils; import java.util.Collection; @@ -51,9 +51,9 @@ public static int bulkDelete(final ContentResolver resolver, final Uri uri, int rows_deleted = 0; for (int i = 0; i < blocks_count; i++) { final int start = i * MAX_BULK_COUNT, end = Math.min(start + MAX_BULK_COUNT, col_values_length); - final String[] block = TwidereArrayUtils.toStringArray(TwidereArrayUtils.subArray(colValues, start, end)); + final String[] block = FiretweetArrayUtils.toStringArray(FiretweetArrayUtils.subArray(colValues, start, end)); if (valuesIsString) { - final StringBuilder where = new StringBuilder(inColumn + " IN(" + TwidereArrayUtils.toStringForSQL(block) + final StringBuilder where = new StringBuilder(inColumn + " IN(" + FiretweetArrayUtils.toStringForSQL(block) + ")"); if (!isEmpty(extraWhere)) { where.append("AND ").append(extraWhere); @@ -61,7 +61,7 @@ public static int bulkDelete(final ContentResolver resolver, final Uri uri, rows_deleted += resolver.delete(uri, where.toString(), block); } else { final StringBuilder where = new StringBuilder(inColumn + " IN(" - + TwidereArrayUtils.toString(block, ',', true) + ")"); + + FiretweetArrayUtils.toString(block, ',', true) + ")"); if (!isEmpty(extraWhere)) { where.append("AND ").append(extraWhere); } diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/content/ContentValuesUtils.java b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/content/ContentValuesUtils.java similarity index 94% rename from twidere.component.common/src/main/java/org/mariotaku/twidere/util/content/ContentValuesUtils.java rename to firetweet.component.common/src/main/java/org/getlantern/firetweet/util/content/ContentValuesUtils.java index f51e3ad1..bb4d71a1 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/util/content/ContentValuesUtils.java +++ b/firetweet.component.common/src/main/java/org/getlantern/firetweet/util/content/ContentValuesUtils.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util.content; +package org.getlantern.firetweet.util.content; import android.content.ContentValues; diff --git a/twidere.component.common/src/main/res/values/arrays.xml b/firetweet.component.common/src/main/res/values/arrays.xml similarity index 96% rename from twidere.component.common/src/main/res/values/arrays.xml rename to firetweet.component.common/src/main/res/values/arrays.xml index 473131e4..44729101 100644 --- a/twidere.component.common/src/main/res/values/arrays.xml +++ b/firetweet.component.common/src/main/res/values/arrays.xml @@ -1,6 +1,6 @@ 56d8f9ff - \ No newline at end of file + diff --git a/twidere.component.common/src/main/res/values/defaults.xml b/firetweet.component.common/src/main/res/values/defaults.xml similarity index 93% rename from twidere.component.common/src/main/res/values/defaults.xml rename to firetweet.component.common/src/main/res/values/defaults.xml index cbe808b8..f95c1d42 100644 --- a/twidere.component.common/src/main/res/values/defaults.xml +++ b/firetweet.component.common/src/main/res/values/defaults.xml @@ -1,6 +1,6 @@ - \ No newline at end of file + diff --git a/twidere.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONArrayParcel.java b/firetweet.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONArrayParcel.java similarity index 90% rename from twidere.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONArrayParcel.java rename to firetweet.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONArrayParcel.java index bce0eb28..58824e9f 100644 --- a/twidere.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONArrayParcel.java +++ b/firetweet.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONArrayParcel.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package org.mariotaku.jsonserializer; +package org.getlantern.firetweetserializer; import org.json.JSONArray; -import org.mariotaku.jsonserializer.JSONParcelable.Creator; +import org.getlantern.firetweetserializer.JSONParcelable.Creator; /** * Created by mariotaku on 15/1/1. diff --git a/twidere.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONParcel.java b/firetweet.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONParcel.java similarity index 99% rename from twidere.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONParcel.java rename to firetweet.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONParcel.java index a2eec4f4..6a96bd27 100644 --- a/twidere.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONParcel.java +++ b/firetweet.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONParcel.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.jsonserializer; +package org.getlantern.firetweetserializer; import org.json.JSONArray; import org.json.JSONException; diff --git a/twidere.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONParcelable.java b/firetweet.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONParcelable.java similarity index 97% rename from twidere.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONParcelable.java rename to firetweet.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONParcelable.java index 9d563d5f..d57ce632 100644 --- a/twidere.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONParcelable.java +++ b/firetweet.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONParcelable.java @@ -25,7 +25,7 @@ * For more information, please refer to */ -package org.mariotaku.jsonserializer; +package org.getlantern.firetweetserializer; public interface JSONParcelable { diff --git a/twidere.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONSerializer.java b/firetweet.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONSerializer.java similarity index 98% rename from twidere.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONSerializer.java rename to firetweet.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONSerializer.java index 88f2120b..939c91c8 100644 --- a/twidere.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONSerializer.java +++ b/firetweet.component.jsonserializer/src/main/java/org/mariotaku/jsonserializer/JSONSerializer.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.jsonserializer; +package org.getlantern.firetweetserializer; import org.json.JSONArray; import org.json.JSONException; diff --git a/twidere.component.nyan/.gitignore b/firetweet.component.nyan/.gitignore similarity index 100% rename from twidere.component.nyan/.gitignore rename to firetweet.component.nyan/.gitignore diff --git a/twidere.component.nyan/build.gradle b/firetweet.component.nyan/build.gradle similarity index 96% rename from twidere.component.nyan/build.gradle rename to firetweet.component.nyan/build.gradle index a166550a..136b3bbe 100644 --- a/twidere.component.nyan/build.gradle +++ b/firetweet.component.nyan/build.gradle @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * diff --git a/twidere.component.nyan/proguard-rules.pro b/firetweet.component.nyan/proguard-rules.pro similarity index 100% rename from twidere.component.nyan/proguard-rules.pro rename to firetweet.component.nyan/proguard-rules.pro diff --git a/twidere.component.nyan/src/androidTest/java/org/mariotaku/twidere/nyan/ApplicationTest.java b/firetweet.component.nyan/src/androidTest/java/org/getlantern/firetweet/nyan/ApplicationTest.java similarity index 92% rename from twidere.component.nyan/src/androidTest/java/org/mariotaku/twidere/nyan/ApplicationTest.java rename to firetweet.component.nyan/src/androidTest/java/org/getlantern/firetweet/nyan/ApplicationTest.java index 4aa0ea77..3f847e1c 100644 --- a/twidere.component.nyan/src/androidTest/java/org/mariotaku/twidere/nyan/ApplicationTest.java +++ b/firetweet.component.nyan/src/androidTest/java/org/getlantern/firetweet/nyan/ApplicationTest.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.nyan; +package org.getlantern.firetweet.nyan; import android.app.Application; import android.test.ApplicationTestCase; @@ -29,4 +29,4 @@ public class ApplicationTest extends ApplicationTestCase { public ApplicationTest() { super(Application.class); } -} \ No newline at end of file +} diff --git a/twidere.component.nyan/src/main/AndroidManifest.xml b/firetweet.component.nyan/src/main/AndroidManifest.xml similarity index 89% rename from twidere.component.nyan/src/main/AndroidManifest.xml rename to firetweet.component.nyan/src/main/AndroidManifest.xml index 744fe74d..72d28c3e 100644 --- a/twidere.component.nyan/src/main/AndroidManifest.xml +++ b/firetweet.component.nyan/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanConstants.java b/firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanConstants.java similarity index 92% rename from twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanConstants.java rename to firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanConstants.java index ac893096..2db03b0f 100644 --- a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanConstants.java +++ b/firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanConstants.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.nyan; +package org.getlantern.firetweet.nyan; /** * Created by mariotaku on 14/12/19. diff --git a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDaydreamService.java b/firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanDaydreamService.java similarity index 97% rename from twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDaydreamService.java rename to firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanDaydreamService.java index c9c9b1c1..eafcf56a 100644 --- a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDaydreamService.java +++ b/firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanDaydreamService.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.nyan; +package org.getlantern.firetweet.nyan; import android.annotation.TargetApi; import android.content.SharedPreferences; diff --git a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDaydreamView.java b/firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanDaydreamView.java similarity index 97% rename from twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDaydreamView.java rename to firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanDaydreamView.java index bd38bbc5..93f01c94 100644 --- a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDaydreamView.java +++ b/firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanDaydreamView.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.nyan; +package org.getlantern.firetweet.nyan; import android.content.Context; import android.content.res.Resources; diff --git a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java b/firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanDrawingHelper.java similarity index 99% rename from twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java rename to firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanDrawingHelper.java index 3339c71b..08a627c3 100644 --- a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java +++ b/firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanDrawingHelper.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.nyan; +package org.getlantern.firetweet.nyan; import android.content.Context; import android.content.res.Resources; diff --git a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanSurfaceHelper.java b/firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanSurfaceHelper.java similarity index 97% rename from twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanSurfaceHelper.java rename to firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanSurfaceHelper.java index 2d1057d5..5935fdbb 100644 --- a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanSurfaceHelper.java +++ b/firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanSurfaceHelper.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.nyan; +package org.getlantern.firetweet.nyan; import android.content.Context; import android.graphics.Canvas; diff --git a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanWallpaperService.java b/firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanWallpaperService.java similarity index 98% rename from twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanWallpaperService.java rename to firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanWallpaperService.java index 5a0c0775..669f7df8 100644 --- a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanWallpaperService.java +++ b/firetweet.component.nyan/src/main/java/org/getlantern/firetweet/nyan/NyanWallpaperService.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.nyan; +package org.getlantern.firetweet.nyan; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame00_tile.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame00_tile.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame00_tile.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame00_tile.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame01_tile.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame01_tile.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame01_tile.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame01_tile.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame02_tile.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame02_tile.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame02_tile.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame02_tile.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame03_tile.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame03_tile.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame03_tile.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame03_tile.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame04_tile.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame04_tile.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame04_tile.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame04_tile.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame05_tile.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame05_tile.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame05_tile.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame05_tile.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame06_tile.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame06_tile.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame06_tile.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame06_tile.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame07_tile.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame07_tile.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame07_tile.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame07_tile.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame08_tile.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame08_tile.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame08_tile.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame08_tile.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame09_tile.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame09_tile.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame09_tile.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame09_tile.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame10_tile.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame10_tile.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame10_tile.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame10_tile.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame11_tile.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame11_tile.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame11_tile.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_rainbow_frame11_tile.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame00.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame00.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame00.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame00.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame01.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame01.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame01.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame01.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame02.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame02.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame02.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame02.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame03.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame03.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame03.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame03.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame04.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame04.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame04.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame04.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame05.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame05.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame05.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame05.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame06.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame06.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame06.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame06.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame07.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame07.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame07.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame07.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame08.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame08.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame08.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame08.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame09.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame09.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame09.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame09.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame10.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame10.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame10.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame10.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame11.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame11.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame11.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_frame11.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame00.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame00.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame00.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame00.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame01.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame01.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame01.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame01.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame02.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame02.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame02.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame02.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame03.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame03.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame03.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame03.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame04.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame04.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame04.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame04.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame05.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame05.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame05.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame05.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame06.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame06.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame06.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame06.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame07.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame07.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame07.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame07.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame08.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame08.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame08.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame08.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame09.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame09.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame09.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame09.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame10.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame10.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame10.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame10.png diff --git a/twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame11.png b/firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame11.png similarity index 100% rename from twidere.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame11.png rename to firetweet.component.nyan/src/main/res/drawable-nodpi/nyan_sakamoto_santa_frame11.png diff --git a/twidere.component.nyan/src/main/res/drawable/nyan_sakamoto.xml b/firetweet.component.nyan/src/main/res/drawable/nyan_sakamoto.xml similarity index 100% rename from twidere.component.nyan/src/main/res/drawable/nyan_sakamoto.xml rename to firetweet.component.nyan/src/main/res/drawable/nyan_sakamoto.xml diff --git a/twidere.component.nyan/src/main/res/drawable/nyan_sakamoto_santa.xml b/firetweet.component.nyan/src/main/res/drawable/nyan_sakamoto_santa.xml similarity index 98% rename from twidere.component.nyan/src/main/res/drawable/nyan_sakamoto_santa.xml rename to firetweet.component.nyan/src/main/res/drawable/nyan_sakamoto_santa.xml index e1ab6c0d..ae9d52ba 100644 --- a/twidere.component.nyan/src/main/res/drawable/nyan_sakamoto_santa.xml +++ b/firetweet.component.nyan/src/main/res/drawable/nyan_sakamoto_santa.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/twidere.component.nyan/src/main/res/values-land/integers.xml b/firetweet.component.nyan/src/main/res/values-land/integers.xml similarity index 100% rename from twidere.component.nyan/src/main/res/values-land/integers.xml rename to firetweet.component.nyan/src/main/res/values-land/integers.xml diff --git a/twidere.component.nyan/src/main/res/values-large-land/integers.xml b/firetweet.component.nyan/src/main/res/values-large-land/integers.xml similarity index 100% rename from twidere.component.nyan/src/main/res/values-large-land/integers.xml rename to firetweet.component.nyan/src/main/res/values-large-land/integers.xml diff --git a/twidere.component.nyan/src/main/res/values-large/integers.xml b/firetweet.component.nyan/src/main/res/values-large/integers.xml similarity index 100% rename from twidere.component.nyan/src/main/res/values-large/integers.xml rename to firetweet.component.nyan/src/main/res/values-large/integers.xml diff --git a/twidere.component.nyan/src/main/res/values-xlarge-land/integers.xml b/firetweet.component.nyan/src/main/res/values-xlarge-land/integers.xml similarity index 100% rename from twidere.component.nyan/src/main/res/values-xlarge-land/integers.xml rename to firetweet.component.nyan/src/main/res/values-xlarge-land/integers.xml diff --git a/twidere.component.nyan/src/main/res/values-xlarge/integers.xml b/firetweet.component.nyan/src/main/res/values-xlarge/integers.xml similarity index 100% rename from twidere.component.nyan/src/main/res/values-xlarge/integers.xml rename to firetweet.component.nyan/src/main/res/values-xlarge/integers.xml diff --git a/twidere.component.nyan/src/main/res/values/colors.xml b/firetweet.component.nyan/src/main/res/values/colors.xml similarity index 100% rename from twidere.component.nyan/src/main/res/values/colors.xml rename to firetweet.component.nyan/src/main/res/values/colors.xml diff --git a/twidere.component.nyan/src/main/res/values/integers.xml b/firetweet.component.nyan/src/main/res/values/integers.xml similarity index 100% rename from twidere.component.nyan/src/main/res/values/integers.xml rename to firetweet.component.nyan/src/main/res/values/integers.xml diff --git a/firetweet.component.nyan/src/main/res/values/strings.xml b/firetweet.component.nyan/src/main/res/values/strings.xml new file mode 100644 index 00000000..9255925b --- /dev/null +++ b/firetweet.component.nyan/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ + + + Firetweet Donate Live Wallpaper + Firetweet Donate Wallpaper + Firetweet Donate Daydream + + diff --git a/twidere.component.querybuilder/.gitignore b/firetweet.component.querybuilder/.gitignore similarity index 100% rename from twidere.component.querybuilder/.gitignore rename to firetweet.component.querybuilder/.gitignore diff --git a/twidere.component.jsonserializer/build.gradle b/firetweet.component.querybuilder/build.gradle similarity index 96% rename from twidere.component.jsonserializer/build.gradle rename to firetweet.component.querybuilder/build.gradle index 7ade2159..3f913f9b 100644 --- a/twidere.component.jsonserializer/build.gradle +++ b/firetweet.component.querybuilder/build.gradle @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.querybuilder/proguard-rules.pro b/firetweet.component.querybuilder/proguard-rules.pro similarity index 100% rename from twidere.component.querybuilder/proguard-rules.pro rename to firetweet.component.querybuilder/proguard-rules.pro diff --git a/firetweet.component.querybuilder/src/androidTest/java/org/getlantern/firetweetcomponentsqlquerybuilder/ApplicationTest.java b/firetweet.component.querybuilder/src/androidTest/java/org/getlantern/firetweetcomponentsqlquerybuilder/ApplicationTest.java new file mode 100644 index 00000000..18ccd15a --- /dev/null +++ b/firetweet.component.querybuilder/src/androidTest/java/org/getlantern/firetweetcomponentsqlquerybuilder/ApplicationTest.java @@ -0,0 +1,32 @@ +/* + * Firetweet - Twitter client for Android + * + * Copyright (C) 2012-2015 Mariotaku Lee + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.getlantern.firetweetcomponentsqlquerybuilder; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase { + public ApplicationTest() { + super(Application.class); + } +} diff --git a/twidere.component.querybuilder/src/main/AndroidManifest.xml b/firetweet.component.querybuilder/src/main/AndroidManifest.xml similarity index 94% rename from twidere.component.querybuilder/src/main/AndroidManifest.xml rename to firetweet.component.querybuilder/src/main/AndroidManifest.xml index 56b347e4..af2128e5 100644 --- a/twidere.component.querybuilder/src/main/AndroidManifest.xml +++ b/firetweet.component.querybuilder/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="org.getlantern.firetweet.library.twitter4j.streaming"> diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/ConnectionLifeCycleListener.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/ConnectionLifeCycleListener.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/ConnectionLifeCycleListener.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/ConnectionLifeCycleListener.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/ControlStreamInfo.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/ControlStreamInfo.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/ControlStreamInfo.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/ControlStreamInfo.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/FilterQuery.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/FilterQuery.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/FilterQuery.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/FilterQuery.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/RawStreamListener.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/RawStreamListener.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/RawStreamListener.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/RawStreamListener.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsAdapter.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsAdapter.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsAdapter.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsAdapter.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsImpl.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsImpl.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsImpl.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsImpl.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsListener.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsListener.java similarity index 99% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsListener.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsListener.java index 33a91109..97a362dd 100644 --- a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsListener.java +++ b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/SiteStreamsListener.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/StallWarning.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StallWarning.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/StallWarning.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StallWarning.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusAdapter.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusAdapter.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusAdapter.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusAdapter.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusDeletionNotice.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusDeletionNotice.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusDeletionNotice.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusDeletionNotice.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusDeletionNoticeImpl.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusDeletionNoticeImpl.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusDeletionNoticeImpl.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusDeletionNoticeImpl.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusListener.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusListener.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusListener.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusListener.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusStream.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusStream.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusStream.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusStream.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusStreamBase.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusStreamBase.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusStreamBase.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusStreamBase.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusStreamImpl.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusStreamImpl.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/StatusStreamImpl.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StatusStreamImpl.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/StreamController.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StreamController.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/StreamController.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StreamController.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/StreamImplementation.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StreamImplementation.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/StreamImplementation.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StreamImplementation.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/StreamListener.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StreamListener.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/StreamListener.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/StreamListener.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStream.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStream.java old mode 100755 new mode 100644 similarity index 99% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStream.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStream.java index d07b61d5..3b02d09d --- a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStream.java +++ b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStream.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamConstants.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamConstants.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamConstants.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamConstants.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamFactory.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamFactory.java similarity index 98% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamFactory.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamFactory.java index 783ee827..f221cd93 100644 --- a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamFactory.java +++ b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamFactory.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamImpl.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamImpl.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamImpl.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/TwitterStreamImpl.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/UserStream.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/UserStream.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/UserStream.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/UserStream.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/UserStreamAdapter.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/UserStreamAdapter.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/UserStreamAdapter.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/UserStreamAdapter.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/UserStreamImpl.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/UserStreamImpl.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/UserStreamImpl.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/UserStreamImpl.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/UserStreamListener.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/UserStreamListener.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/UserStreamListener.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/UserStreamListener.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/VersionStream.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/VersionStream.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/VersionStream.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/VersionStream.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/BaseStreamConfigurationFactory.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/BaseStreamConfigurationFactory.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/BaseStreamConfigurationFactory.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/BaseStreamConfigurationFactory.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfiguration.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfiguration.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfiguration.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfiguration.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationBase.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationBase.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationBase.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationBase.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationBuilder.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationBuilder.java similarity index 99% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationBuilder.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationBuilder.java index 6d09f733..288cc492 100644 --- a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationBuilder.java +++ b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationBuilder.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationContext.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationContext.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationContext.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationContext.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationFactory.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationFactory.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationFactory.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/conf/StreamConfigurationFactory.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/internal/async/Dispatcher.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/internal/async/Dispatcher.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/internal/async/Dispatcher.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/internal/async/Dispatcher.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/internal/async/DispatcherFactory.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/internal/async/DispatcherFactory.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/internal/async/DispatcherFactory.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/internal/async/DispatcherFactory.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/internal/async/DispatcherImpl.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/internal/async/DispatcherImpl.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/internal/async/DispatcherImpl.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/internal/async/DispatcherImpl.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/internal/json/DataObjectFactoryUtil.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/internal/json/DataObjectFactoryUtil.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/internal/json/DataObjectFactoryUtil.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/internal/json/DataObjectFactoryUtil.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/json/DataObjectFactory.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/json/DataObjectFactory.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/json/DataObjectFactory.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/json/DataObjectFactory.java diff --git a/twidere.component.twitter4j.streaming/src/main/java/twitter4j/json/JSONObjectType.java b/firetweet.component.twitter4j.streaming/src/main/java/twitter4j/json/JSONObjectType.java similarity index 100% rename from twidere.component.twitter4j.streaming/src/main/java/twitter4j/json/JSONObjectType.java rename to firetweet.component.twitter4j.streaming/src/main/java/twitter4j/json/JSONObjectType.java diff --git a/twidere.component.twitter4j/.gitignore b/firetweet.component.twitter4j/.gitignore similarity index 100% rename from twidere.component.twitter4j/.gitignore rename to firetweet.component.twitter4j/.gitignore diff --git a/twidere.component.twitter4j/build.gradle b/firetweet.component.twitter4j/build.gradle similarity index 96% rename from twidere.component.twitter4j/build.gradle rename to firetweet.component.twitter4j/build.gradle index a166550a..136b3bbe 100644 --- a/twidere.component.twitter4j/build.gradle +++ b/firetweet.component.twitter4j/build.gradle @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/AndroidManifest.xml b/firetweet.component.twitter4j/src/main/AndroidManifest.xml similarity index 89% rename from twidere.component.twitter4j/src/main/AndroidManifest.xml rename to firetweet.component.twitter4j/src/main/AndroidManifest.xml index 4d10a1c9..c7587de5 100644 --- a/twidere.component.twitter4j/src/main/AndroidManifest.xml +++ b/firetweet.component.twitter4j/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="org.getlantern.firetweet.library.twitter4j"> diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/AccountSettings.java b/firetweet.component.twitter4j/src/main/java/twitter4j/AccountSettings.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/AccountSettings.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/AccountSettings.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/AccountTotals.java b/firetweet.component.twitter4j/src/main/java/twitter4j/AccountTotals.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/AccountTotals.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/AccountTotals.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Activity.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Activity.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/Activity.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Activity.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/CardEntity.java b/firetweet.component.twitter4j/src/main/java/twitter4j/CardEntity.java similarity index 97% rename from twidere.component.twitter4j/src/main/java/twitter4j/CardEntity.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/CardEntity.java index ac9f3aaf..06ff7fc2 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/CardEntity.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/CardEntity.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Category.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Category.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/Category.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Category.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/CursorPaging.java b/firetweet.component.twitter4j/src/main/java/twitter4j/CursorPaging.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/CursorPaging.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/CursorPaging.java index 3bcc2fc9..9ceb2e46 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/CursorPaging.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/CursorPaging.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/CursorSupport.java b/firetweet.component.twitter4j/src/main/java/twitter4j/CursorSupport.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/CursorSupport.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/CursorSupport.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/DirectMessage.java b/firetweet.component.twitter4j/src/main/java/twitter4j/DirectMessage.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/DirectMessage.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/DirectMessage.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/EntitySupport.java b/firetweet.component.twitter4j/src/main/java/twitter4j/EntitySupport.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/EntitySupport.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/EntitySupport.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/ExceptionDiagnosis.java b/firetweet.component.twitter4j/src/main/java/twitter4j/ExceptionDiagnosis.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/ExceptionDiagnosis.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/ExceptionDiagnosis.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/ExtendedEntitySupport.java b/firetweet.component.twitter4j/src/main/java/twitter4j/ExtendedEntitySupport.java similarity index 96% rename from twidere.component.twitter4j/src/main/java/twitter4j/ExtendedEntitySupport.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/ExtendedEntitySupport.java index 5ad152da..1894e705 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/ExtendedEntitySupport.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/ExtendedEntitySupport.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Friendship.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Friendship.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/Friendship.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Friendship.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/GeoLocation.java b/firetweet.component.twitter4j/src/main/java/twitter4j/GeoLocation.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/GeoLocation.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/GeoLocation.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/GeoQuery.java b/firetweet.component.twitter4j/src/main/java/twitter4j/GeoQuery.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/GeoQuery.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/GeoQuery.java index 282ae448..b5e22314 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/GeoQuery.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/GeoQuery.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/HashtagEntity.java b/firetweet.component.twitter4j/src/main/java/twitter4j/HashtagEntity.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/HashtagEntity.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/HashtagEntity.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/IDs.java b/firetweet.component.twitter4j/src/main/java/twitter4j/IDs.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/IDs.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/IDs.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Location.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Location.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/Location.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Location.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/MediaEntity.java b/firetweet.component.twitter4j/src/main/java/twitter4j/MediaEntity.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/MediaEntity.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/MediaEntity.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/MediaUploadResponse.java b/firetweet.component.twitter4j/src/main/java/twitter4j/MediaUploadResponse.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/MediaUploadResponse.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/MediaUploadResponse.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/OEmbed.java b/firetweet.component.twitter4j/src/main/java/twitter4j/OEmbed.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/OEmbed.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/OEmbed.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/OEmbedRequest.java b/firetweet.component.twitter4j/src/main/java/twitter4j/OEmbedRequest.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/OEmbedRequest.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/OEmbedRequest.java index d29b9fd0..ccece7f7 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/OEmbedRequest.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/OEmbedRequest.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/PageableResponseList.java b/firetweet.component.twitter4j/src/main/java/twitter4j/PageableResponseList.java similarity index 95% rename from twidere.component.twitter4j/src/main/java/twitter4j/PageableResponseList.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/PageableResponseList.java index 8898a0c5..8de924a9 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/PageableResponseList.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/PageableResponseList.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Paging.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Paging.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/Paging.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Paging.java index 94af0b8b..7617d373 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/Paging.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/Paging.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Place.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Place.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/Place.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Place.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Query.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Query.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/Query.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Query.java index 8635b65a..fb12d119 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/Query.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/Query.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/QueryResult.java b/firetweet.component.twitter4j/src/main/java/twitter4j/QueryResult.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/QueryResult.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/QueryResult.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/RateLimitStatus.java b/firetweet.component.twitter4j/src/main/java/twitter4j/RateLimitStatus.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/RateLimitStatus.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/RateLimitStatus.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/RateLimitStatusEvent.java b/firetweet.component.twitter4j/src/main/java/twitter4j/RateLimitStatusEvent.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/RateLimitStatusEvent.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/RateLimitStatusEvent.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/RateLimitStatusListener.java b/firetweet.component.twitter4j/src/main/java/twitter4j/RateLimitStatusListener.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/RateLimitStatusListener.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/RateLimitStatusListener.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Relationship.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Relationship.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/Relationship.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Relationship.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/ReportAs.java b/firetweet.component.twitter4j/src/main/java/twitter4j/ReportAs.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/ReportAs.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/ReportAs.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/ResponseList.java b/firetweet.component.twitter4j/src/main/java/twitter4j/ResponseList.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/ResponseList.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/ResponseList.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/SavedSearch.java b/firetweet.component.twitter4j/src/main/java/twitter4j/SavedSearch.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/SavedSearch.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/SavedSearch.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/SettingsUpdate.java b/firetweet.component.twitter4j/src/main/java/twitter4j/SettingsUpdate.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/SettingsUpdate.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/SettingsUpdate.java index d45a307d..1e73ac1f 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/SettingsUpdate.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/SettingsUpdate.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/SimilarPlaces.java b/firetweet.component.twitter4j/src/main/java/twitter4j/SimilarPlaces.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/SimilarPlaces.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/SimilarPlaces.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Status.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Status.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/Status.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Status.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/StatusActivitySummary.java b/firetweet.component.twitter4j/src/main/java/twitter4j/StatusActivitySummary.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/StatusActivitySummary.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/StatusActivitySummary.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/StatusUpdate.java b/firetweet.component.twitter4j/src/main/java/twitter4j/StatusUpdate.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/StatusUpdate.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/StatusUpdate.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/TimeZone.java b/firetweet.component.twitter4j/src/main/java/twitter4j/TimeZone.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/TimeZone.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/TimeZone.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/TranslationResult.java b/firetweet.component.twitter4j/src/main/java/twitter4j/TranslationResult.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/TranslationResult.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/TranslationResult.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Trend.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Trend.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/Trend.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Trend.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Trends.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Trends.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/Trends.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Trends.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Twitter.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Twitter.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/Twitter.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Twitter.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterAPIConfiguration.java b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterAPIConfiguration.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/TwitterAPIConfiguration.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/TwitterAPIConfiguration.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterAPIMonitor.java b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterAPIMonitor.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/TwitterAPIMonitor.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/TwitterAPIMonitor.java index 1dc53805..8a3ed779 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterAPIMonitor.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterAPIMonitor.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterBase.java b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterBase.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/TwitterBase.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/TwitterBase.java index 91d46b68..eca5f359 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterBase.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterBase.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterBaseImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterBaseImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/TwitterBaseImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/TwitterBaseImpl.java index 97e75e54..eefa7ed1 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterBaseImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterBaseImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterConstants.java b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterConstants.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/TwitterConstants.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/TwitterConstants.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterException.java b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterException.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/TwitterException.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/TwitterException.java index 2e41e9e8..675b319c 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterException.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterException.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterFactory.java b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterFactory.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/TwitterFactory.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/TwitterFactory.java index e48234fe..d463864c 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterFactory.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterFactory.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/TwitterImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/TwitterImpl.java index 6028695f..7d008c8d 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterResponse.java b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterResponse.java similarity index 97% rename from twidere.component.twitter4j/src/main/java/twitter4j/TwitterResponse.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/TwitterResponse.java index 7fca1eca..e6e0b375 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/TwitterResponse.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/TwitterResponse.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/URLEntity.java b/firetweet.component.twitter4j/src/main/java/twitter4j/URLEntity.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/URLEntity.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/URLEntity.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/User.java b/firetweet.component.twitter4j/src/main/java/twitter4j/User.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/User.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/User.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/UserList.java b/firetweet.component.twitter4j/src/main/java/twitter4j/UserList.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/UserList.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/UserList.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/UserMentionEntity.java b/firetweet.component.twitter4j/src/main/java/twitter4j/UserMentionEntity.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/UserMentionEntity.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/UserMentionEntity.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/Version.java b/firetweet.component.twitter4j/src/main/java/twitter4j/Version.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/Version.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/Version.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/DirectMessagesResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/DirectMessagesResources.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/DirectMessagesResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/DirectMessagesResources.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/FavoritesResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/FavoritesResources.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/FavoritesResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/FavoritesResources.java index 1c0d4e23..def61117 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/api/FavoritesResources.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/api/FavoritesResources.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/FriendsFollowersResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/FriendsFollowersResources.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/FriendsFollowersResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/FriendsFollowersResources.java index 67aa22b9..bfa038dd 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/api/FriendsFollowersResources.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/api/FriendsFollowersResources.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/HelpResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/HelpResources.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/HelpResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/HelpResources.java index dfcfbb4f..445869a0 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/api/HelpResources.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/api/HelpResources.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/ListsResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/ListsResources.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/ListsResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/ListsResources.java index 9b91d310..1edd61a5 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/api/ListsResources.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/api/ListsResources.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/MediaResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/MediaResources.java similarity index 96% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/MediaResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/MediaResources.java index ef021f16..a48f7b7c 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/api/MediaResources.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/api/MediaResources.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/PlacesGeoResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/PlacesGeoResources.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/PlacesGeoResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/PlacesGeoResources.java index 9b2d4096..d6e47367 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/api/PlacesGeoResources.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/api/PlacesGeoResources.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateActivityResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateActivityResources.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateActivityResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateActivityResources.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateDirectMessagesResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateDirectMessagesResources.java similarity index 95% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateDirectMessagesResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateDirectMessagesResources.java index f092e459..49843553 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateDirectMessagesResources.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateDirectMessagesResources.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateFriendsFollowersResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateFriendsFollowersResources.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateFriendsFollowersResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateFriendsFollowersResources.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateResources.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateResources.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateTimelinesResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateTimelinesResources.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateTimelinesResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateTimelinesResources.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateTweetResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateTweetResources.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/PrivateTweetResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/PrivateTweetResources.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/SavedSearchesResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/SavedSearchesResources.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/SavedSearchesResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/SavedSearchesResources.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/SearchResource.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/SearchResource.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/SearchResource.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/SearchResource.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/SpamReportingResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/SpamReportingResources.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/SpamReportingResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/SpamReportingResources.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/TimelinesResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/TimelinesResources.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/TimelinesResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/TimelinesResources.java index cb0f81bf..40714671 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/api/TimelinesResources.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/api/TimelinesResources.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/TrendsResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/TrendsResources.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/TrendsResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/TrendsResources.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/TweetResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/TweetResources.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/TweetResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/TweetResources.java index efbdf3f4..e3ae0602 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/api/TweetResources.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/api/TweetResources.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/api/UsersResources.java b/firetweet.component.twitter4j/src/main/java/twitter4j/api/UsersResources.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/api/UsersResources.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/api/UsersResources.java index ba45501f..ee67701b 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/api/UsersResources.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/api/UsersResources.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/auth/AccessToken.java b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/AccessToken.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/auth/AccessToken.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/auth/AccessToken.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/auth/Authorization.java b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/Authorization.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/auth/Authorization.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/auth/Authorization.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/auth/AuthorizationConfiguration.java b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/AuthorizationConfiguration.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/auth/AuthorizationConfiguration.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/auth/AuthorizationConfiguration.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/auth/AuthorizationFactory.java b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/AuthorizationFactory.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/auth/AuthorizationFactory.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/auth/AuthorizationFactory.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/auth/BasicAuthorization.java b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/BasicAuthorization.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/auth/BasicAuthorization.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/auth/BasicAuthorization.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/auth/NullAuthorization.java b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/NullAuthorization.java similarity index 97% rename from twidere.component.twitter4j/src/main/java/twitter4j/auth/NullAuthorization.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/auth/NullAuthorization.java index 01cf2ccd..54ab0177 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/auth/NullAuthorization.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/NullAuthorization.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/auth/OAuthAuthorization.java b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/OAuthAuthorization.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/auth/OAuthAuthorization.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/auth/OAuthAuthorization.java index 525e19df..28a207ef 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/auth/OAuthAuthorization.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/OAuthAuthorization.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/auth/OAuthSupport.java b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/OAuthSupport.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/auth/OAuthSupport.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/auth/OAuthSupport.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/auth/OAuthToken.java b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/OAuthToken.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/auth/OAuthToken.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/auth/OAuthToken.java index 13bb4f65..8457a127 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/auth/OAuthToken.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/OAuthToken.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/auth/RequestToken.java b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/RequestToken.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/auth/RequestToken.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/auth/RequestToken.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/auth/TwipOModeAuthorization.java b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/TwipOModeAuthorization.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/auth/TwipOModeAuthorization.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/auth/TwipOModeAuthorization.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/auth/XAuthAuthorization.java b/firetweet.component.twitter4j/src/main/java/twitter4j/auth/XAuthAuthorization.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/auth/XAuthAuthorization.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/auth/XAuthAuthorization.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/conf/BaseConfigurationFactory.java b/firetweet.component.twitter4j/src/main/java/twitter4j/conf/BaseConfigurationFactory.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/conf/BaseConfigurationFactory.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/conf/BaseConfigurationFactory.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/conf/Configuration.java b/firetweet.component.twitter4j/src/main/java/twitter4j/conf/Configuration.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/conf/Configuration.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/conf/Configuration.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationBase.java b/firetweet.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationBase.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationBase.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationBase.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationBuilder.java b/firetweet.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationBuilder.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationBuilder.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationBuilder.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationContext.java b/firetweet.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationContext.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationContext.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationContext.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationFactory.java b/firetweet.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationFactory.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationFactory.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/conf/ConfigurationFactory.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/BASE64Encoder.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/BASE64Encoder.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/BASE64Encoder.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/BASE64Encoder.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/FactoryUtils.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/FactoryUtils.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/FactoryUtils.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/FactoryUtils.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HTMLEntity.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HTMLEntity.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HTMLEntity.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HTMLEntity.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HeaderMap.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HeaderMap.java similarity index 96% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HeaderMap.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HeaderMap.java index 5a933b82..e4c51dc5 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/http/HeaderMap.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HeaderMap.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HostAddressResolver.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HostAddressResolver.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HostAddressResolver.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HostAddressResolver.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HostAddressResolverFactory.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HostAddressResolverFactory.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HostAddressResolverFactory.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HostAddressResolverFactory.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClient.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClient.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClient.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClient.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientBase.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientBase.java similarity index 97% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientBase.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientBase.java index ce9b9c9d..53118ada 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientBase.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientBase.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientConfiguration.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientConfiguration.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientConfiguration.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientConfiguration.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientFactory.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientFactory.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientFactory.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientFactory.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientImpl.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientImpl.java index 7c5f2dce..add57364 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientWrapper.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientWrapper.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientWrapper.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientWrapper.java index 55ae1614..61d8394e 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientWrapper.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientWrapper.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientWrapperConfiguration.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientWrapperConfiguration.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpClientWrapperConfiguration.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpClientWrapperConfiguration.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpParameter.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpParameter.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpParameter.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpParameter.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpRequest.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpRequest.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpRequest.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpRequest.java index 508fb92c..13d0638b 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpRequest.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpRequest.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpResponse.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpResponse.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpResponse.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpResponse.java index a9915937..feeec226 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpResponse.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpResponse.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpResponseCode.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpResponseCode.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpResponseCode.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpResponseCode.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpResponseEvent.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpResponseEvent.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpResponseEvent.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpResponseEvent.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/HttpResponseListener.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpResponseListener.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/HttpResponseListener.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/HttpResponseListener.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/RequestMethod.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/RequestMethod.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/RequestMethod.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/RequestMethod.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/http/StreamingGZIPInputStream.java b/firetweet.component.twitter4j/src/main/java/twitter4j/http/StreamingGZIPInputStream.java similarity index 97% rename from twidere.component.twitter4j/src/main/java/twitter4j/http/StreamingGZIPInputStream.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/http/StreamingGZIPInputStream.java index e57b457b..d9369d72 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/http/StreamingGZIPInputStream.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/http/StreamingGZIPInputStream.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/AccountSettingsJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/AccountSettingsJSONImpl.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/AccountSettingsJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/AccountSettingsJSONImpl.java index 5f52c2b1..9a4fd0cf 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/AccountSettingsJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/AccountSettingsJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/AccountTotalsJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/AccountTotalsJSONImpl.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/AccountTotalsJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/AccountTotalsJSONImpl.java index 76bb76fc..fa1ab11d 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/AccountTotalsJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/AccountTotalsJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/ActivityJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/ActivityJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/ActivityJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/ActivityJSONImpl.java index bd88a84d..f9117cc8 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/ActivityJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/ActivityJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/CardEntityJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/CardEntityJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/CardEntityJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/CardEntityJSONImpl.java index 15a1caef..02f5254c 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/CardEntityJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/CardEntityJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/CategoryJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/CategoryJSONImpl.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/CategoryJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/CategoryJSONImpl.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/DirectMessageJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/DirectMessageJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/DirectMessageJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/DirectMessageJSONImpl.java index d20000fc..94717d92 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/DirectMessageJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/DirectMessageJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/FriendshipJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/FriendshipJSONImpl.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/FriendshipJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/FriendshipJSONImpl.java index 9bd71723..34b6205c 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/FriendshipJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/FriendshipJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/HashtagEntityJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/HashtagEntityJSONImpl.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/HashtagEntityJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/HashtagEntityJSONImpl.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/IDsJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/IDsJSONImpl.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/IDsJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/IDsJSONImpl.java index d8730840..6a7414c4 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/IDsJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/IDsJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/InternalJSONFactory.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/InternalJSONFactory.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/InternalJSONFactory.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/InternalJSONFactory.java index 6ea0c74c..f62c7469 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/InternalJSONFactory.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/InternalJSONFactory.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/InternalJSONFactoryImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/InternalJSONFactoryImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/InternalJSONFactoryImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/InternalJSONFactoryImpl.java index 4aa1de52..65b2569a 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/InternalJSONFactoryImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/InternalJSONFactoryImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/LanguageJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/LanguageJSONImpl.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/LanguageJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/LanguageJSONImpl.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/LocationJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/LocationJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/LocationJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/LocationJSONImpl.java index 75fbcd2b..a0cba01c 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/LocationJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/LocationJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/MediaEntityJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/MediaEntityJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/MediaEntityJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/MediaEntityJSONImpl.java index 22151e12..8c9ddbd0 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/MediaEntityJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/MediaEntityJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/MediaUploadResponseJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/MediaUploadResponseJSONImpl.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/MediaUploadResponseJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/MediaUploadResponseJSONImpl.java index a4524110..391b7a3d 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/MediaUploadResponseJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/MediaUploadResponseJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/OEmbedJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/OEmbedJSONImpl.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/OEmbedJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/OEmbedJSONImpl.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/PageableResponseListImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/PageableResponseListImpl.java similarity index 97% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/PageableResponseListImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/PageableResponseListImpl.java index eb975d51..74e6d345 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/PageableResponseListImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/PageableResponseListImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/PlaceJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/PlaceJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/PlaceJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/PlaceJSONImpl.java index b18dbcb1..2886650e 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/PlaceJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/PlaceJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/QueryResultJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/QueryResultJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/QueryResultJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/QueryResultJSONImpl.java index a69d1dd1..0f6f858b 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/QueryResultJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/QueryResultJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/RateLimitStatusJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/RateLimitStatusJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/RateLimitStatusJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/RateLimitStatusJSONImpl.java index 18437cd4..eea84338 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/RateLimitStatusJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/RateLimitStatusJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/RelationshipJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/RelationshipJSONImpl.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/RelationshipJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/RelationshipJSONImpl.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/ResponseListImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/ResponseListImpl.java similarity index 97% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/ResponseListImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/ResponseListImpl.java index a5805566..4ca7aefa 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/ResponseListImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/ResponseListImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/SavedSearchJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/SavedSearchJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/SavedSearchJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/SavedSearchJSONImpl.java index 029d3bdb..2a9684f6 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/SavedSearchJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/SavedSearchJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/SimilarPlacesImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/SimilarPlacesImpl.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/SimilarPlacesImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/SimilarPlacesImpl.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/StatusActivitySummaryJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/StatusActivitySummaryJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/StatusActivitySummaryJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/StatusActivitySummaryJSONImpl.java index d1424de4..dffb701c 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/StatusActivitySummaryJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/StatusActivitySummaryJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/StatusJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/StatusJSONImpl.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/StatusJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/StatusJSONImpl.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TimeZoneJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TimeZoneJSONImpl.java similarity index 97% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TimeZoneJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TimeZoneJSONImpl.java index c8ee88c3..5b01d4ea 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TimeZoneJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TimeZoneJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TranslationResultJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TranslationResultJSONImpl.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TranslationResultJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TranslationResultJSONImpl.java index 0c8ea4de..6e522a38 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TranslationResultJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TranslationResultJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TrendJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TrendJSONImpl.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TrendJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TrendJSONImpl.java index b42de6d0..7495a14b 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TrendJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TrendJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TrendsJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TrendsJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TrendsJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TrendsJSONImpl.java index 9c7c0e5f..5f331bda 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TrendsJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TrendsJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TwitterAPIConfigurationJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TwitterAPIConfigurationJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TwitterAPIConfigurationJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TwitterAPIConfigurationJSONImpl.java index 5346eecb..7c8f073d 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TwitterAPIConfigurationJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TwitterAPIConfigurationJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TwitterResponseImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TwitterResponseImpl.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/TwitterResponseImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/TwitterResponseImpl.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/URLEntityJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/URLEntityJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/URLEntityJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/URLEntityJSONImpl.java index 7c0afd6d..7e1ae733 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/URLEntityJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/URLEntityJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/UserJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/UserJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/UserJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/UserJSONImpl.java index 5fb24f2e..d18f02c1 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/UserJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/UserJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/UserListJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/UserListJSONImpl.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/UserListJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/UserListJSONImpl.java index 53657a1b..b8eb380b 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/UserListJSONImpl.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/UserListJSONImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/json/UserMentionEntityJSONImpl.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/UserMentionEntityJSONImpl.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/json/UserMentionEntityJSONImpl.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/json/UserMentionEntityJSONImpl.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/AndroidLogger.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/AndroidLogger.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/AndroidLogger.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/AndroidLogger.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/AndroidLoggerFactory.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/AndroidLoggerFactory.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/AndroidLoggerFactory.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/AndroidLoggerFactory.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/Logger.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/Logger.java similarity index 98% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/Logger.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/Logger.java index cf72836c..b8c60f8d 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/Logger.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/Logger.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/LoggerFactory.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/LoggerFactory.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/LoggerFactory.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/LoggerFactory.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/NullLogger.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/NullLogger.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/NullLogger.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/NullLogger.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/NullLoggerFactory.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/NullLoggerFactory.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/logging/NullLoggerFactory.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/logging/NullLoggerFactory.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/util/InternalParseUtil.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/util/InternalParseUtil.java similarity index 99% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/util/InternalParseUtil.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/util/InternalParseUtil.java index c733cfda..6e7eca5c 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/internal/util/InternalParseUtil.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/util/InternalParseUtil.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/internal/util/InternalStringUtil.java b/firetweet.component.twitter4j/src/main/java/twitter4j/internal/util/InternalStringUtil.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/internal/util/InternalStringUtil.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/internal/util/InternalStringUtil.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/lib/MyClass.java b/firetweet.component.twitter4j/src/main/java/twitter4j/lib/MyClass.java similarity index 94% rename from twidere.component.twitter4j/src/main/java/twitter4j/lib/MyClass.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/lib/MyClass.java index 1d2f03a8..82054abe 100644 --- a/twidere.component.twitter4j/src/main/java/twitter4j/lib/MyClass.java +++ b/firetweet.component.twitter4j/src/main/java/twitter4j/lib/MyClass.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/management/APIStatistics.java b/firetweet.component.twitter4j/src/main/java/twitter4j/management/APIStatistics.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/management/APIStatistics.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/management/APIStatistics.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/management/APIStatisticsMBean.java b/firetweet.component.twitter4j/src/main/java/twitter4j/management/APIStatisticsMBean.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/management/APIStatisticsMBean.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/management/APIStatisticsMBean.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/management/InvocationStatistics.java b/firetweet.component.twitter4j/src/main/java/twitter4j/management/InvocationStatistics.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/management/InvocationStatistics.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/management/InvocationStatistics.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/management/InvocationStatisticsCalculator.java b/firetweet.component.twitter4j/src/main/java/twitter4j/management/InvocationStatisticsCalculator.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/management/InvocationStatisticsCalculator.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/management/InvocationStatisticsCalculator.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/util/CharacterUtil.java b/firetweet.component.twitter4j/src/main/java/twitter4j/util/CharacterUtil.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/util/CharacterUtil.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/util/CharacterUtil.java diff --git a/twidere.component.twitter4j/src/main/java/twitter4j/util/TimeSpanConverter.java b/firetweet.component.twitter4j/src/main/java/twitter4j/util/TimeSpanConverter.java similarity index 100% rename from twidere.component.twitter4j/src/main/java/twitter4j/util/TimeSpanConverter.java rename to firetweet.component.twitter4j/src/main/java/twitter4j/util/TimeSpanConverter.java diff --git a/twidere.donate.nyanwp.wear/.gitignore b/firetweet.donate.nyanwp.wear/.gitignore similarity index 100% rename from twidere.donate.nyanwp.wear/.gitignore rename to firetweet.donate.nyanwp.wear/.gitignore diff --git a/twidere.donate.nyanwp.wear/build.gradle b/firetweet.donate.nyanwp.wear/build.gradle similarity index 89% rename from twidere.donate.nyanwp.wear/build.gradle rename to firetweet.donate.nyanwp.wear/build.gradle index 7f551661..5ced2ff7 100644 --- a/twidere.donate.nyanwp.wear/build.gradle +++ b/firetweet.donate.nyanwp.wear/build.gradle @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -23,7 +23,7 @@ apply from: rootProject.file('signing.gradle') android { defaultConfig { - applicationId "org.mariotaku.twidere.donate.nyanwp" + applicationId "org.getlantern.firetweet.donate.nyanwp" minSdkVersion 20 targetSdkVersion 22 versionCode 1 @@ -37,6 +37,6 @@ android { dependencies { compile 'com.google.android.support:wearable:1.1.0' - compile project(':twidere.component.nyan') + compile project(':firetweet.component.nyan') compile fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/twidere.donate.nyanwp.wear/proguard-rules.pro b/firetweet.donate.nyanwp.wear/proguard-rules.pro similarity index 100% rename from twidere.donate.nyanwp.wear/proguard-rules.pro rename to firetweet.donate.nyanwp.wear/proguard-rules.pro diff --git a/twidere.donate.nyanwp.wear/src/main/AndroidManifest.xml b/firetweet.donate.nyanwp.wear/src/main/AndroidManifest.xml similarity index 93% rename from twidere.donate.nyanwp.wear/src/main/AndroidManifest.xml rename to firetweet.donate.nyanwp.wear/src/main/AndroidManifest.xml index dde69e97..4822e29e 100644 --- a/twidere.donate.nyanwp.wear/src/main/AndroidManifest.xml +++ b/firetweet.donate.nyanwp.wear/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - diff --git a/twidere.donate.nyanwp.wear/src/main/java/org/mariotaku/twidere/donate/nyanwp/NyanActivity.java b/firetweet.donate.nyanwp.wear/src/main/java/org/getlantern/firetweet/donate/nyanwp/NyanActivity.java similarity index 91% rename from twidere.donate.nyanwp.wear/src/main/java/org/mariotaku/twidere/donate/nyanwp/NyanActivity.java rename to firetweet.donate.nyanwp.wear/src/main/java/org/getlantern/firetweet/donate/nyanwp/NyanActivity.java index 55d39318..5a0a526b 100644 --- a/twidere.donate.nyanwp.wear/src/main/java/org/mariotaku/twidere/donate/nyanwp/NyanActivity.java +++ b/firetweet.donate.nyanwp.wear/src/main/java/org/getlantern/firetweet/donate/nyanwp/NyanActivity.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.donate.nyanwp; +package org.getlantern.firetweet.donate.nyanwp; import android.app.Activity; import android.os.Bundle; import android.support.wearable.view.WatchViewStub; import android.support.wearable.view.WatchViewStub.OnLayoutInflatedListener; -import org.mariotaku.twidere.nyan.NyanDaydreamView; +import org.getlantern.firetweet.nyan.NyanDaydreamView; public class NyanActivity extends Activity implements OnLayoutInflatedListener { diff --git a/twidere.donate.nyanwp.wear/src/main/res/drawable-hdpi/ic_launcher.png b/firetweet.donate.nyanwp.wear/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from twidere.donate.nyanwp.wear/src/main/res/drawable-hdpi/ic_launcher.png rename to firetweet.donate.nyanwp.wear/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/twidere.donate.nyanwp.wear/src/main/res/drawable-mdpi/ic_launcher.png b/firetweet.donate.nyanwp.wear/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from twidere.donate.nyanwp.wear/src/main/res/drawable-mdpi/ic_launcher.png rename to firetweet.donate.nyanwp.wear/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/twidere.donate.nyanwp.wear/src/main/res/drawable-xhdpi/ic_launcher.png b/firetweet.donate.nyanwp.wear/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from twidere.donate.nyanwp.wear/src/main/res/drawable-xhdpi/ic_launcher.png rename to firetweet.donate.nyanwp.wear/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/twidere.donate.nyanwp.wear/src/main/res/drawable-xxhdpi/ic_launcher.png b/firetweet.donate.nyanwp.wear/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from twidere.donate.nyanwp.wear/src/main/res/drawable-xxhdpi/ic_launcher.png rename to firetweet.donate.nyanwp.wear/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/twidere.donate.nyanwp.wear/src/main/res/drawable-xxxhdpi/ic_launcher.png b/firetweet.donate.nyanwp.wear/src/main/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from twidere.donate.nyanwp.wear/src/main/res/drawable-xxxhdpi/ic_launcher.png rename to firetweet.donate.nyanwp.wear/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/twidere.donate.nyanwp.wear/src/main/res/layout/activity_nyan.xml b/firetweet.donate.nyanwp.wear/src/main/res/layout/activity_nyan.xml similarity index 96% rename from twidere.donate.nyanwp.wear/src/main/res/layout/activity_nyan.xml rename to firetweet.donate.nyanwp.wear/src/main/res/layout/activity_nyan.xml index 1c23a928..18263f9b 100644 --- a/twidere.donate.nyanwp.wear/src/main/res/layout/activity_nyan.xml +++ b/firetweet.donate.nyanwp.wear/src/main/res/layout/activity_nyan.xml @@ -1,6 +1,6 @@ - \ No newline at end of file + tools:deviceIds="wear_square"/> diff --git a/twidere.donate.nyanwp.wear/src/main/res/layout/round_activity_nyan.xml b/firetweet.donate.nyanwp.wear/src/main/res/layout/round_activity_nyan.xml similarity index 89% rename from twidere.donate.nyanwp.wear/src/main/res/layout/round_activity_nyan.xml rename to firetweet.donate.nyanwp.wear/src/main/res/layout/round_activity_nyan.xml index 78cc70d0..18b203df 100644 --- a/twidere.donate.nyanwp.wear/src/main/res/layout/round_activity_nyan.xml +++ b/firetweet.donate.nyanwp.wear/src/main/res/layout/round_activity_nyan.xml @@ -1,6 +1,6 @@ - \ No newline at end of file + tools:deviceIds="wear_round"/> diff --git a/twidere.donate.nyanwp.wear/src/main/res/values/strings.xml b/firetweet.donate.nyanwp.wear/src/main/res/values/strings.xml similarity index 95% rename from twidere.donate.nyanwp.wear/src/main/res/values/strings.xml rename to firetweet.donate.nyanwp.wear/src/main/res/values/strings.xml index 90708bd8..77003b27 100644 --- a/twidere.donate.nyanwp.wear/src/main/res/values/strings.xml +++ b/firetweet.donate.nyanwp.wear/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ - + + android:name="org.getlantern.firetweet.extension.settings" + android:value="org.getlantern.firetweet.extension.push.xiaomi.MainActivity"/> + * android:name="org.getlantern.firetweet.extension.push.xiaomi.DemoMessageReceiver"> * * * diff --git a/twidere.extension.push.xiaomi/src/main/java/org/mariotaku/twidere/extension/push/xiaomi/MainActivity.java b/firetweet.extension.push.xiaomi/src/main/java/org/getlantern/firetweet/extension/push/xiaomi/MainActivity.java similarity index 58% rename from twidere.extension.push.xiaomi/src/main/java/org/mariotaku/twidere/extension/push/xiaomi/MainActivity.java rename to firetweet.extension.push.xiaomi/src/main/java/org/getlantern/firetweet/extension/push/xiaomi/MainActivity.java index ae3faa18..a6ddb119 100644 --- a/twidere.extension.push.xiaomi/src/main/java/org/mariotaku/twidere/extension/push/xiaomi/MainActivity.java +++ b/firetweet.extension.push.xiaomi/src/main/java/org/getlantern/firetweet/extension/push/xiaomi/MainActivity.java @@ -1,4 +1,4 @@ -package org.mariotaku.twidere.extension.push.xiaomi; +package org.getlantern.firetweet.extension.push.xiaomi; import android.app.Activity; diff --git a/twidere.extension.push.xiaomi/src/main/res/drawable-hdpi/ic_custom_notify.png b/firetweet.extension.push.xiaomi/src/main/res/drawable-hdpi/ic_custom_notify.png similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/drawable-hdpi/ic_custom_notify.png rename to firetweet.extension.push.xiaomi/src/main/res/drawable-hdpi/ic_custom_notify.png diff --git a/twidere.extension.push.xiaomi/src/main/res/drawable-hdpi/ic_launcher.png b/firetweet.extension.push.xiaomi/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/drawable-hdpi/ic_launcher.png rename to firetweet.extension.push.xiaomi/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/twidere.extension.push.xiaomi/src/main/res/drawable-mdpi/ic_launcher.png b/firetweet.extension.push.xiaomi/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/drawable-mdpi/ic_launcher.png rename to firetweet.extension.push.xiaomi/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/twidere.extension.push.xiaomi/src/main/res/drawable-xhdpi/ic_launcher.png b/firetweet.extension.push.xiaomi/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/drawable-xhdpi/ic_launcher.png rename to firetweet.extension.push.xiaomi/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/twidere.extension.push.xiaomi/src/main/res/drawable-xhdpi/ic_tip.png b/firetweet.extension.push.xiaomi/src/main/res/drawable-xhdpi/ic_tip.png similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/drawable-xhdpi/ic_tip.png rename to firetweet.extension.push.xiaomi/src/main/res/drawable-xhdpi/ic_tip.png diff --git a/twidere.extension.push.xiaomi/src/main/res/drawable-xxhdpi/ic_launcher.png b/firetweet.extension.push.xiaomi/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/drawable-xxhdpi/ic_launcher.png rename to firetweet.extension.push.xiaomi/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/twidere.extension.push.xiaomi/src/main/res/layout/activity_main.xml b/firetweet.extension.push.xiaomi/src/main/res/layout/activity_main.xml similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/layout/activity_main.xml rename to firetweet.extension.push.xiaomi/src/main/res/layout/activity_main.xml diff --git a/twidere.extension.push.xiaomi/src/main/res/layout/custom_notify.xml b/firetweet.extension.push.xiaomi/src/main/res/layout/custom_notify.xml similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/layout/custom_notify.xml rename to firetweet.extension.push.xiaomi/src/main/res/layout/custom_notify.xml diff --git a/twidere.extension.push.xiaomi/src/main/res/layout/set_time_dialog.xml b/firetweet.extension.push.xiaomi/src/main/res/layout/set_time_dialog.xml similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/layout/set_time_dialog.xml rename to firetweet.extension.push.xiaomi/src/main/res/layout/set_time_dialog.xml diff --git a/twidere.extension.push.xiaomi/src/main/res/menu/main.xml b/firetweet.extension.push.xiaomi/src/main/res/menu/main.xml similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/menu/main.xml rename to firetweet.extension.push.xiaomi/src/main/res/menu/main.xml diff --git a/twidere.extension.push.xiaomi/src/main/res/values-sw600dp/dimens.xml b/firetweet.extension.push.xiaomi/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/values-sw600dp/dimens.xml rename to firetweet.extension.push.xiaomi/src/main/res/values-sw600dp/dimens.xml diff --git a/twidere.extension.push.xiaomi/src/main/res/values-sw720dp-land/dimens.xml b/firetweet.extension.push.xiaomi/src/main/res/values-sw720dp-land/dimens.xml similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/values-sw720dp-land/dimens.xml rename to firetweet.extension.push.xiaomi/src/main/res/values-sw720dp-land/dimens.xml diff --git a/twidere.extension.push.xiaomi/src/main/res/values/colors.xml b/firetweet.extension.push.xiaomi/src/main/res/values/colors.xml similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/values/colors.xml rename to firetweet.extension.push.xiaomi/src/main/res/values/colors.xml diff --git a/twidere.extension.push.xiaomi/src/main/res/values/dimens.xml b/firetweet.extension.push.xiaomi/src/main/res/values/dimens.xml similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/values/dimens.xml rename to firetweet.extension.push.xiaomi/src/main/res/values/dimens.xml diff --git a/twidere.extension.push.xiaomi/src/main/res/values/strings.xml b/firetweet.extension.push.xiaomi/src/main/res/values/strings.xml similarity index 100% rename from twidere.extension.push.xiaomi/src/main/res/values/strings.xml rename to firetweet.extension.push.xiaomi/src/main/res/values/strings.xml diff --git a/twidere.extension.streaming/.gitignore b/firetweet.extension.streaming/.gitignore similarity index 100% rename from twidere.extension.streaming/.gitignore rename to firetweet.extension.streaming/.gitignore diff --git a/twidere.extension.streaming/build.gradle b/firetweet.extension.streaming/build.gradle similarity index 89% rename from twidere.extension.streaming/build.gradle rename to firetweet.extension.streaming/build.gradle index 478fc1fc..3af77ff0 100644 --- a/twidere.extension.streaming/build.gradle +++ b/firetweet.extension.streaming/build.gradle @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -23,7 +23,7 @@ apply from: rootProject.file('signing.gradle') android { defaultConfig { - applicationId "org.mariotaku.twidere.extension.streaming" + applicationId "org.getlantern.firetweet.extension.streaming" minSdkVersion 14 targetSdkVersion 22 versionCode 14 @@ -44,6 +44,6 @@ android { dependencies { compile 'com.squareup.okhttp:okhttp:2.3.0' compile project(':twidere.library.extension') - compile project(':twidere.component.twitter4j.streaming') + compile project(':firetweet.component.twitter4j.streaming') compile fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/twidere.extension.streaming/proguard-rules.pro b/firetweet.extension.streaming/proguard-rules.pro similarity index 100% rename from twidere.extension.streaming/proguard-rules.pro rename to firetweet.extension.streaming/proguard-rules.pro diff --git a/twidere.component.querybuilder/src/androidTest/java/org/mariotaku/twiderecomponentsqlquerybuilder/ApplicationTest.java b/firetweet.extension.streaming/src/androidTest/java/org/getlantern/firetweet/extension/streaming/ApplicationTest.java similarity index 91% rename from twidere.component.querybuilder/src/androidTest/java/org/mariotaku/twiderecomponentsqlquerybuilder/ApplicationTest.java rename to firetweet.extension.streaming/src/androidTest/java/org/getlantern/firetweet/extension/streaming/ApplicationTest.java index d4003c1e..b88adc36 100644 --- a/twidere.component.querybuilder/src/androidTest/java/org/mariotaku/twiderecomponentsqlquerybuilder/ApplicationTest.java +++ b/firetweet.extension.streaming/src/androidTest/java/org/getlantern/firetweet/extension/streaming/ApplicationTest.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twiderecomponentsqlquerybuilder; +package org.getlantern.firetweet.extension.streaming; import android.app.Application; import android.test.ApplicationTestCase; @@ -29,4 +29,4 @@ public class ApplicationTest extends ApplicationTestCase { public ApplicationTest() { super(Application.class); } -} \ No newline at end of file +} diff --git a/twidere.extension.streaming/src/main/AndroidManifest.xml b/firetweet.extension.streaming/src/main/AndroidManifest.xml similarity index 56% rename from twidere.extension.streaming/src/main/AndroidManifest.xml rename to firetweet.extension.streaming/src/main/AndroidManifest.xml index 41c9021c..8a0cf7bb 100644 --- a/twidere.extension.streaming/src/main/AndroidManifest.xml +++ b/firetweet.extension.streaming/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="org.getlantern.firetweet.extension.streaming"> @@ -10,19 +10,19 @@ android:icon="@drawable/ic_launcher" android:label="@string/app_name"> + android:name="org.getlantern.firetweet.extension.settings" + android:value="org.getlantern.firetweet.extension.streaming.SettingsActivity"/> - + - - + + diff --git a/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/Constants.java b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/Constants.java new file mode 100644 index 00000000..832213da --- /dev/null +++ b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/Constants.java @@ -0,0 +1,12 @@ +package org.getlantern.firetweet.extension.streaming; + +import org.getlantern.firetweet.FiretweetConstants; + +public interface Constants extends FiretweetConstants { + + public static final String LOGTAG = "Firetweet.Streaming"; + + public static final String PREFERENCE_KEY_ACCOUNT_IDS = "account_ids"; + public static final String PREFERENCE_KEY_ENABLE_STREAMING = "enable_streaming"; + +} diff --git a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/TwidereLaunchReceiver.java b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/FiretweetLaunchReceiver.java similarity index 57% rename from twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/TwidereLaunchReceiver.java rename to firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/FiretweetLaunchReceiver.java index b7bdcc8a..68f0cac4 100644 --- a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/TwidereLaunchReceiver.java +++ b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/FiretweetLaunchReceiver.java @@ -1,20 +1,20 @@ -package org.mariotaku.twidere.extension.streaming; +package org.getlantern.firetweet.extension.streaming; -import org.mariotaku.twidere.Twidere; +import org.getlantern.firetweet.Firetweet; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -public class TwidereLaunchReceiver extends BroadcastReceiver { +public class FiretweetLaunchReceiver extends BroadcastReceiver { @Override public void onReceive(final Context context, final Intent intent) { final String action = intent.getAction(); final Intent service_intent = new Intent(context, StreamingService.class); - if (Twidere.BROADCAST_HOME_ACTIVITY_ONCREATE.equals(action)) { + if (Firetweet.BROADCAST_HOME_ACTIVITY_ONCREATE.equals(action)) { context.startService(service_intent); - } else if (Twidere.BROADCAST_HOME_ACTIVITY_ONDESTROY.equals(action)) { + } else if (Firetweet.BROADCAST_HOME_ACTIVITY_ONDESTROY.equals(action)) { context.stopService(service_intent); } } diff --git a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/PrivateConstants.java b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/PrivateConstants.java similarity index 88% rename from twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/PrivateConstants.java rename to firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/PrivateConstants.java index 02e0a8c2..721d377c 100644 --- a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/PrivateConstants.java +++ b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/PrivateConstants.java @@ -1,4 +1,4 @@ -package org.mariotaku.twidere.extension.streaming; +package org.getlantern.firetweet.extension.streaming; public interface PrivateConstants { diff --git a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/SettingsActivity.java b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/SettingsActivity.java similarity index 86% rename from twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/SettingsActivity.java rename to firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/SettingsActivity.java index d6862652..dafadac0 100644 --- a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/SettingsActivity.java +++ b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/SettingsActivity.java @@ -1,6 +1,6 @@ -package org.mariotaku.twidere.extension.streaming; +package org.getlantern.firetweet.extension.streaming; -import org.mariotaku.twidere.Twidere; +import org.getlantern.firetweet.Firetweet; import android.content.ActivityNotFoundException; import android.content.Intent; @@ -46,15 +46,15 @@ protected void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); final boolean granted; try { - granted = Twidere.isPermissionGranted(this); + granted = Firetweet.isPermissionGranted(this); } catch (final SecurityException e) { // TODO show error finish(); return; } if (!granted) { - final Intent intent = new Intent(Twidere.INTENT_ACTION_REQUEST_PERMISSIONS); - intent.setPackage("org.mariotaku.twidere"); + final Intent intent = new Intent(Firetweet.INTENT_ACTION_REQUEST_PERMISSIONS); + intent.setPackage("org.getlantern.firetweet"); try { startActivityForResult(intent, REQUEST_REQUEST_PERMISSIONS); } catch (final ActivityNotFoundException e) { diff --git a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/StreamingService.java b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/StreamingService.java similarity index 90% rename from twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/StreamingService.java rename to firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/StreamingService.java index 9f4cc9b3..42a25031 100644 --- a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/StreamingService.java +++ b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/StreamingService.java @@ -1,4 +1,4 @@ -package org.mariotaku.twidere.extension.streaming; +package org.getlantern.firetweet.extension.streaming; import android.app.Notification; import android.app.NotificationManager; @@ -17,20 +17,20 @@ import android.util.Log; import android.widget.Toast; -import org.mariotaku.twidere.Twidere; -import org.mariotaku.twidere.TwidereSharedPreferences; -import org.mariotaku.twidere.extension.streaming.util.OkHttpClientFactory; -import org.mariotaku.twidere.extension.streaming.util.TwidereHostAddressResolverFactory; -import org.mariotaku.twidere.extension.streaming.util.Utils; -import org.mariotaku.twidere.library.twitter4j.streaming.BuildConfig; -import org.mariotaku.twidere.model.ParcelableAccount; -import org.mariotaku.twidere.model.ParcelableAccount.ParcelableCredentials; -import org.mariotaku.twidere.provider.TwidereDataStore.Accounts; -import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages; -import org.mariotaku.twidere.provider.TwidereDataStore.Mentions; -import org.mariotaku.twidere.provider.TwidereDataStore.Statuses; -import org.mariotaku.twidere.util.ContentValuesCreator; -import org.mariotaku.twidere.util.TwidereArrayUtils; +import org.getlantern.firetweet.Firetweet; +import org.getlantern.firetweet.FiretweetSharedPreferences; +import org.getlantern.firetweet.extension.streaming.util.OkHttpClientFactory; +import org.getlantern.firetweet.extension.streaming.util.FiretweetHostAddressResolverFactory; +import org.getlantern.firetweet.extension.streaming.util.Utils; +import org.getlantern.firetweet.library.twitter4j.streaming.BuildConfig; +import org.getlantern.firetweet.model.ParcelableAccount; +import org.getlantern.firetweet.model.ParcelableAccount.ParcelableCredentials; +import org.getlantern.firetweet.provider.FiretweetDataStore.Accounts; +import org.getlantern.firetweet.provider.FiretweetDataStore.DirectMessages; +import org.getlantern.firetweet.provider.FiretweetDataStore.Mentions; +import org.getlantern.firetweet.provider.FiretweetDataStore.Statuses; +import org.getlantern.firetweet.util.ContentValuesCreator; +import org.getlantern.firetweet.util.FiretweetArrayUtils; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -76,7 +76,7 @@ public void onChange(final boolean selfChange) { @Override public void onChange(final boolean selfChange, final Uri uri) { - if (!TwidereArrayUtils.contentMatch(mAccountIds, Utils.getActivatedAccountIds(StreamingService.this))) { + if (!FiretweetArrayUtils.contentMatch(mAccountIds, Utils.getActivatedAccountIds(StreamingService.this))) { initStreaming(); } } @@ -125,13 +125,13 @@ private void initStreaming() { if (!mPreferences.getBoolean(PREFERENCE_KEY_ENABLE_STREAMING, true)) return; final boolean granted; try { - granted = Twidere.isPermissionGranted(this); + granted = Firetweet.isPermissionGranted(this); } catch (final SecurityException e) { stopSelf(); return; } if (granted) { - final TwidereSharedPreferences prefs = Twidere.getSharedPreferences(this); + final FiretweetSharedPreferences prefs = Firetweet.getSharedPreferences(this); if (setTwitterInstances(prefs)) { final Intent intent = new Intent(this, SettingsActivity.class); final PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent, @@ -140,7 +140,7 @@ private void initStreaming() { final CharSequence contentText = getString(R.string.streaming_service_running); final Notification notification = new Notification(); notification.flags = Notification.FLAG_ONGOING_EVENT; - notification.icon = R.drawable.ic_stat_twidere; + notification.icon = R.drawable.ic_stat_firetweet; notification.tickerText = getString(R.string.streaming_service_running); notification.setLatestEventInfo(this, contentTitle, contentText, contentIntent); mNotificationManager.notify(NOTIFICATION_SERVICE_STARTED, notification); @@ -162,7 +162,7 @@ private void initStreaming() { } } - private boolean setTwitterInstances(final TwidereSharedPreferences prefs) { + private boolean setTwitterInstances(final FiretweetSharedPreferences prefs) { if (prefs == null) return false; final List accountsList = ParcelableAccount.getCredentialsList(this, true); if (BuildConfig.DEBUG) { @@ -178,12 +178,12 @@ private boolean setTwitterInstances(final TwidereSharedPreferences prefs) { mAccountIds[i] = account_id; final StreamConfigurationBuilder cb = new StreamConfigurationBuilder(); cb.setHttpClientFactory(new OkHttpClientFactory(this)); - cb.setHostAddressResolverFactory(new TwidereHostAddressResolverFactory(this)); + cb.setHostAddressResolverFactory(new FiretweetHostAddressResolverFactory(this)); cb.setGZIPEnabled(prefs.getBoolean(KEY_GZIP_COMPRESSING, true)); cb.setIncludeEntitiesEnabled(true); if (prefs.getBoolean(KEY_IGNORE_SSL_ERROR, false)) { cb.setIgnoreSSLError(true); - cb.setHostAddressResolverFactory(new TwidereHostAddressResolverFactory(this)); + cb.setHostAddressResolverFactory(new FiretweetHostAddressResolverFactory(this)); } final String default_consumer_key = Utils .getNonEmptyString(prefs, KEY_CONSUMER_KEY, TWITTER_CONSUMER_KEY_2); @@ -280,7 +280,7 @@ public void onDirectMessage(final DirectMessage directMessage) { final ContentValues values = ContentValuesCreator.createDirectMessage(directMessage, account_id, false); final Uri.Builder builder = DirectMessages.Inbox.CONTENT_URI.buildUpon(); - builder.appendQueryParameter(Twidere.QUERY_PARAM_NOTIFY, "true"); + builder.appendQueryParameter(Firetweet.QUERY_PARAM_NOTIFY, "true"); if (values != null) { resolver.insert(builder.build(), values); } diff --git a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/model/ParcelableUserMention.java b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/model/ParcelableUserMention.java similarity index 94% rename from twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/model/ParcelableUserMention.java rename to firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/model/ParcelableUserMention.java index 4ab5b99d..37e82970 100644 --- a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/model/ParcelableUserMention.java +++ b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/model/ParcelableUserMention.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2014 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.extension.streaming.model; +package org.getlantern.firetweet.extension.streaming.model; import android.os.Parcel; import android.os.Parcelable; @@ -25,9 +25,9 @@ import org.json.JSONArray; import org.json.JSONException; -import org.mariotaku.jsonserializer.JSONParcel; -import org.mariotaku.jsonserializer.JSONParcelable; -import org.mariotaku.jsonserializer.JSONSerializer; +import org.getlantern.firetweetserializer.JSONParcel; +import org.getlantern.firetweetserializer.JSONParcelable; +import org.getlantern.firetweetserializer.JSONSerializer; import twitter4j.Status; import twitter4j.UserMentionEntity; diff --git a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/ActivityAccessor.java b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/ActivityAccessor.java similarity index 96% rename from twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/ActivityAccessor.java rename to firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/ActivityAccessor.java index 6bfd747c..ee79d799 100644 --- a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/ActivityAccessor.java +++ b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/ActivityAccessor.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.extension.streaming.util; +package org.getlantern.firetweet.extension.streaming.util; import android.annotation.TargetApi; import android.app.ActionBar; diff --git a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/TwidereHostAddressResolver.java b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/FiretweetHostAddressResolver.java similarity index 80% rename from twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/TwidereHostAddressResolver.java rename to firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/FiretweetHostAddressResolver.java index b18a30b9..bb14e334 100644 --- a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/TwidereHostAddressResolver.java +++ b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/FiretweetHostAddressResolver.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012 Mariotaku Lee * @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.extension.streaming.util; +package org.getlantern.firetweet.extension.streaming.util; import android.content.Context; import android.util.Log; -import org.mariotaku.twidere.Twidere; -import org.mariotaku.twidere.extension.streaming.BuildConfig; +import org.getlantern.firetweet.Firetweet; +import org.getlantern.firetweet.extension.streaming.BuildConfig; import java.net.InetAddress; import java.net.UnknownHostException; @@ -32,14 +32,14 @@ import twitter4j.http.HostAddressResolver; -public class TwidereHostAddressResolver implements HostAddressResolver { +public class FiretweetHostAddressResolver implements HostAddressResolver { - private static final String RESOLVER_LOGTAG = "Twidere.Streaming.Host"; + private static final String RESOLVER_LOGTAG = "Firetweet.Streaming.Host"; private final HostCache mHostCache = new HostCache(512); private final Context mContext; - public TwidereHostAddressResolver(final Context context) { + public FiretweetHostAddressResolver(final Context context) { mContext = context; } @@ -54,7 +54,7 @@ public InetAddress[] resolve(final String host) throws UnknownHostException { } return cached; } - final InetAddress[] resolved = Twidere.resolveHost(mContext, host); + final InetAddress[] resolved = Firetweet.resolveHost(mContext, host); mHostCache.put(host, resolved); return resolved; } diff --git a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/TwidereHostAddressResolverFactory.java b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/FiretweetHostAddressResolverFactory.java similarity index 78% rename from twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/TwidereHostAddressResolverFactory.java rename to firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/FiretweetHostAddressResolverFactory.java index f71459e3..7faf347f 100644 --- a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/TwidereHostAddressResolverFactory.java +++ b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/FiretweetHostAddressResolverFactory.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.extension.streaming.util; +package org.getlantern.firetweet.extension.streaming.util; import android.content.Context; @@ -28,15 +28,15 @@ /** * Created by mariotaku on 15/1/11. */ -public class TwidereHostAddressResolverFactory implements HostAddressResolverFactory { +public class FiretweetHostAddressResolverFactory implements HostAddressResolverFactory { private final Context context; - public TwidereHostAddressResolverFactory(Context context) { + public FiretweetHostAddressResolverFactory(Context context) { this.context = context; } @Override public HostAddressResolver getInstance(HttpClientConfiguration conf) { - return new TwidereHostAddressResolver(context); + return new FiretweetHostAddressResolver(context); } } diff --git a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/OkHttpClientFactory.java b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/OkHttpClientFactory.java similarity index 92% rename from twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/OkHttpClientFactory.java rename to firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/OkHttpClientFactory.java index d87f0dc2..90efdab8 100644 --- a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/OkHttpClientFactory.java +++ b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/OkHttpClientFactory.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.extension.streaming.util; +package org.getlantern.firetweet.extension.streaming.util; import android.content.Context; diff --git a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/OkHttpClientImpl.java b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/OkHttpClientImpl.java similarity index 97% rename from twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/OkHttpClientImpl.java rename to firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/OkHttpClientImpl.java index c8ac2b1f..258d9df3 100644 --- a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/OkHttpClientImpl.java +++ b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/OkHttpClientImpl.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.extension.streaming.util; +package org.getlantern.firetweet.extension.streaming.util; import android.net.SSLCertificateSocketFactory; import android.net.Uri; @@ -32,7 +32,7 @@ import com.squareup.okhttp.internal.Internal; import com.squareup.okhttp.internal.Network; -import org.mariotaku.twidere.TwidereConstants; +import org.getlantern.firetweet.FiretweetConstants; import java.io.IOException; import java.io.InputStream; @@ -65,7 +65,7 @@ /** * Created by mariotaku on 15/1/22. */ -public class OkHttpClientImpl implements HttpClient, TwidereConstants { +public class OkHttpClientImpl implements HttpClient, FiretweetConstants { public static final MediaType APPLICATION_FORM_URLENCODED = MediaType.parse("application/x-www-form-urlencoded; charset=UTF-8"); private final HttpClientConfiguration conf; diff --git a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/Utils.java b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/Utils.java similarity index 79% rename from twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/Utils.java rename to firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/Utils.java index 98bbbb21..a1bea462 100644 --- a/twidere.extension.streaming/src/main/java/org/mariotaku/twidere/extension/streaming/util/Utils.java +++ b/firetweet.extension.streaming/src/main/java/org/getlantern/firetweet/extension/streaming/util/Utils.java @@ -1,18 +1,18 @@ -package org.mariotaku.twidere.extension.streaming.util; +package org.getlantern.firetweet.extension.streaming.util; import android.content.Context; import android.database.Cursor; -import org.mariotaku.twidere.TwidereConstants; -import org.mariotaku.twidere.TwidereSharedPreferences; -import org.mariotaku.twidere.provider.TwidereDataStore.Accounts; +import org.getlantern.firetweet.FiretweetConstants; +import org.getlantern.firetweet.FiretweetSharedPreferences; +import org.getlantern.firetweet.provider.FiretweetDataStore.Accounts; import java.io.Closeable; import java.io.IOException; import static android.text.TextUtils.isEmpty; -public class Utils implements TwidereConstants { +public class Utils implements FiretweetConstants { public static void closeSilently(Closeable closeable) { @@ -45,7 +45,7 @@ public static long[] getActivatedAccountIds(final Context context) { return accounts; } - public static String getNonEmptyString(final TwidereSharedPreferences pref, final String key, final String def) { + public static String getNonEmptyString(final FiretweetSharedPreferences pref, final String key, final String def) { if (pref == null) return def; final String val = pref.getString(key, def); return isEmpty(val) ? def : val; diff --git a/twidere.extension.streaming/src/main/res/drawable-hdpi-v11/ic_stat_twidere.png b/firetweet.extension.streaming/src/main/res/drawable-hdpi-v11/ic_stat_firetweet.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-hdpi-v11/ic_stat_twidere.png rename to firetweet.extension.streaming/src/main/res/drawable-hdpi-v11/ic_stat_firetweet.png diff --git a/twidere.extension.streaming/src/main/res/drawable-hdpi-v11/ic_stat_login.png b/firetweet.extension.streaming/src/main/res/drawable-hdpi-v11/ic_stat_login.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-hdpi-v11/ic_stat_login.png rename to firetweet.extension.streaming/src/main/res/drawable-hdpi-v11/ic_stat_login.png diff --git a/twidere.extension.streaming/src/main/res/drawable-hdpi-v9/ic_stat_twidere.png b/firetweet.extension.streaming/src/main/res/drawable-hdpi-v9/ic_stat_firetweet.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-hdpi-v9/ic_stat_twidere.png rename to firetweet.extension.streaming/src/main/res/drawable-hdpi-v9/ic_stat_firetweet.png diff --git a/twidere.extension.streaming/src/main/res/drawable-hdpi-v9/ic_stat_login.png b/firetweet.extension.streaming/src/main/res/drawable-hdpi-v9/ic_stat_login.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-hdpi-v9/ic_stat_login.png rename to firetweet.extension.streaming/src/main/res/drawable-hdpi-v9/ic_stat_login.png diff --git a/twidere.extension.streaming/src/main/res/drawable-hdpi/ic_launcher.png b/firetweet.extension.streaming/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-hdpi/ic_launcher.png rename to firetweet.extension.streaming/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/twidere.extension.streaming/src/main/res/drawable-hdpi/ic_stat_twidere.png b/firetweet.extension.streaming/src/main/res/drawable-hdpi/ic_stat_firetweet.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-hdpi/ic_stat_twidere.png rename to firetweet.extension.streaming/src/main/res/drawable-hdpi/ic_stat_firetweet.png diff --git a/twidere.extension.streaming/src/main/res/drawable-hdpi/ic_stat_login.png b/firetweet.extension.streaming/src/main/res/drawable-hdpi/ic_stat_login.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-hdpi/ic_stat_login.png rename to firetweet.extension.streaming/src/main/res/drawable-hdpi/ic_stat_login.png diff --git a/twidere.extension.streaming/src/main/res/drawable-ldpi-v11/ic_stat_twidere.png b/firetweet.extension.streaming/src/main/res/drawable-ldpi-v11/ic_stat_firetweet.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-ldpi-v11/ic_stat_twidere.png rename to firetweet.extension.streaming/src/main/res/drawable-ldpi-v11/ic_stat_firetweet.png diff --git a/twidere.extension.streaming/src/main/res/drawable-ldpi-v11/ic_stat_login.png b/firetweet.extension.streaming/src/main/res/drawable-ldpi-v11/ic_stat_login.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-ldpi-v11/ic_stat_login.png rename to firetweet.extension.streaming/src/main/res/drawable-ldpi-v11/ic_stat_login.png diff --git a/twidere.extension.streaming/src/main/res/drawable-ldpi-v9/ic_stat_twidere.png b/firetweet.extension.streaming/src/main/res/drawable-ldpi-v9/ic_stat_firetweet.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-ldpi-v9/ic_stat_twidere.png rename to firetweet.extension.streaming/src/main/res/drawable-ldpi-v9/ic_stat_firetweet.png diff --git a/twidere.extension.streaming/src/main/res/drawable-ldpi-v9/ic_stat_login.png b/firetweet.extension.streaming/src/main/res/drawable-ldpi-v9/ic_stat_login.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-ldpi-v9/ic_stat_login.png rename to firetweet.extension.streaming/src/main/res/drawable-ldpi-v9/ic_stat_login.png diff --git a/twidere.extension.streaming/src/main/res/drawable-mdpi-v11/ic_stat_twidere.png b/firetweet.extension.streaming/src/main/res/drawable-mdpi-v11/ic_stat_firetweet.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-mdpi-v11/ic_stat_twidere.png rename to firetweet.extension.streaming/src/main/res/drawable-mdpi-v11/ic_stat_firetweet.png diff --git a/twidere.extension.streaming/src/main/res/drawable-mdpi-v11/ic_stat_login.png b/firetweet.extension.streaming/src/main/res/drawable-mdpi-v11/ic_stat_login.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-mdpi-v11/ic_stat_login.png rename to firetweet.extension.streaming/src/main/res/drawable-mdpi-v11/ic_stat_login.png diff --git a/twidere.extension.streaming/src/main/res/drawable-mdpi-v9/ic_stat_twidere.png b/firetweet.extension.streaming/src/main/res/drawable-mdpi-v9/ic_stat_firetweet.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-mdpi-v9/ic_stat_twidere.png rename to firetweet.extension.streaming/src/main/res/drawable-mdpi-v9/ic_stat_firetweet.png diff --git a/twidere.extension.streaming/src/main/res/drawable-mdpi-v9/ic_stat_login.png b/firetweet.extension.streaming/src/main/res/drawable-mdpi-v9/ic_stat_login.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-mdpi-v9/ic_stat_login.png rename to firetweet.extension.streaming/src/main/res/drawable-mdpi-v9/ic_stat_login.png diff --git a/twidere.extension.streaming/src/main/res/drawable-mdpi/ic_launcher.png b/firetweet.extension.streaming/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-mdpi/ic_launcher.png rename to firetweet.extension.streaming/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/twidere.extension.streaming/src/main/res/drawable-mdpi/ic_stat_twidere.png b/firetweet.extension.streaming/src/main/res/drawable-mdpi/ic_stat_firetweet.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-mdpi/ic_stat_twidere.png rename to firetweet.extension.streaming/src/main/res/drawable-mdpi/ic_stat_firetweet.png diff --git a/twidere.extension.streaming/src/main/res/drawable-mdpi/ic_stat_login.png b/firetweet.extension.streaming/src/main/res/drawable-mdpi/ic_stat_login.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-mdpi/ic_stat_login.png rename to firetweet.extension.streaming/src/main/res/drawable-mdpi/ic_stat_login.png diff --git a/twidere.extension.streaming/src/main/res/drawable-xhdpi-v11/ic_stat_twidere.png b/firetweet.extension.streaming/src/main/res/drawable-xhdpi-v11/ic_stat_firetweet.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-xhdpi-v11/ic_stat_twidere.png rename to firetweet.extension.streaming/src/main/res/drawable-xhdpi-v11/ic_stat_firetweet.png diff --git a/twidere.extension.streaming/src/main/res/drawable-xhdpi-v11/ic_stat_login.png b/firetweet.extension.streaming/src/main/res/drawable-xhdpi-v11/ic_stat_login.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-xhdpi-v11/ic_stat_login.png rename to firetweet.extension.streaming/src/main/res/drawable-xhdpi-v11/ic_stat_login.png diff --git a/twidere.extension.streaming/src/main/res/drawable-xhdpi-v9/ic_stat_twidere.png b/firetweet.extension.streaming/src/main/res/drawable-xhdpi-v9/ic_stat_firetweet.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-xhdpi-v9/ic_stat_twidere.png rename to firetweet.extension.streaming/src/main/res/drawable-xhdpi-v9/ic_stat_firetweet.png diff --git a/twidere.extension.streaming/src/main/res/drawable-xhdpi-v9/ic_stat_login.png b/firetweet.extension.streaming/src/main/res/drawable-xhdpi-v9/ic_stat_login.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-xhdpi-v9/ic_stat_login.png rename to firetweet.extension.streaming/src/main/res/drawable-xhdpi-v9/ic_stat_login.png diff --git a/twidere.extension.streaming/src/main/res/drawable-xhdpi/ic_launcher.png b/firetweet.extension.streaming/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-xhdpi/ic_launcher.png rename to firetweet.extension.streaming/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/twidere.extension.streaming/src/main/res/drawable-xhdpi/ic_stat_twidere.png b/firetweet.extension.streaming/src/main/res/drawable-xhdpi/ic_stat_firetweet.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-xhdpi/ic_stat_twidere.png rename to firetweet.extension.streaming/src/main/res/drawable-xhdpi/ic_stat_firetweet.png diff --git a/twidere.extension.streaming/src/main/res/drawable-xhdpi/ic_stat_login.png b/firetweet.extension.streaming/src/main/res/drawable-xhdpi/ic_stat_login.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-xhdpi/ic_stat_login.png rename to firetweet.extension.streaming/src/main/res/drawable-xhdpi/ic_stat_login.png diff --git a/twidere.extension.streaming/src/main/res/drawable-xxhdpi/ic_launcher.png b/firetweet.extension.streaming/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from twidere.extension.streaming/src/main/res/drawable-xxhdpi/ic_launcher.png rename to firetweet.extension.streaming/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/twidere.extension.streaming/src/main/res/values-hdpi/bools.xml b/firetweet.extension.streaming/src/main/res/values-hdpi/bools.xml similarity index 100% rename from twidere.extension.streaming/src/main/res/values-hdpi/bools.xml rename to firetweet.extension.streaming/src/main/res/values-hdpi/bools.xml diff --git a/twidere.extension.streaming/src/main/res/values/bools.xml b/firetweet.extension.streaming/src/main/res/values/bools.xml similarity index 100% rename from twidere.extension.streaming/src/main/res/values/bools.xml rename to firetweet.extension.streaming/src/main/res/values/bools.xml diff --git a/twidere.extension.streaming/src/main/res/values/strings.xml b/firetweet.extension.streaming/src/main/res/values/strings.xml similarity index 77% rename from twidere.extension.streaming/src/main/res/values/strings.xml rename to firetweet.extension.streaming/src/main/res/values/strings.xml index 07434861..cca2e194 100644 --- a/twidere.extension.streaming/src/main/res/values/strings.xml +++ b/firetweet.extension.streaming/src/main/res/values/strings.xml @@ -1,9 +1,9 @@ - Twidere Streaming Extension + Firetweet Streaming Extension Select accounts Enable streaming Streaming service is running - Permission request to access Twidere + Permission request to access Firetweet diff --git a/twidere.extension.streaming/src/main/res/xml/settings.xml b/firetweet.extension.streaming/src/main/res/xml/settings.xml similarity index 100% rename from twidere.extension.streaming/src/main/res/xml/settings.xml rename to firetweet.extension.streaming/src/main/res/xml/settings.xml diff --git a/twidere.extension.twitlonger/.gitignore b/firetweet.extension.twitlonger/.gitignore similarity index 100% rename from twidere.extension.twitlonger/.gitignore rename to firetweet.extension.twitlonger/.gitignore diff --git a/twidere.extension.twitlonger/build.gradle b/firetweet.extension.twitlonger/build.gradle similarity index 97% rename from twidere.extension.twitlonger/build.gradle rename to firetweet.extension.twitlonger/build.gradle index 8caa3522..01b497c2 100644 --- a/twidere.extension.twitlonger/build.gradle +++ b/firetweet.extension.twitlonger/build.gradle @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * diff --git a/twidere.extension.twitlonger/ic_launcher-web.png b/firetweet.extension.twitlonger/ic_launcher-web.png similarity index 100% rename from twidere.extension.twitlonger/ic_launcher-web.png rename to firetweet.extension.twitlonger/ic_launcher-web.png diff --git a/twidere.extension.twitlonger/proguard-rules.pro b/firetweet.extension.twitlonger/proguard-rules.pro similarity index 100% rename from twidere.extension.twitlonger/proguard-rules.pro rename to firetweet.extension.twitlonger/proguard-rules.pro diff --git a/twidere.extension.twitlonger/src/androidTest/java/org/mariotaku/extension/twitlonger/ApplicationTest.java b/firetweet.extension.twitlonger/src/androidTest/java/org/mariotaku/extension/twitlonger/ApplicationTest.java similarity index 96% rename from twidere.extension.twitlonger/src/androidTest/java/org/mariotaku/extension/twitlonger/ApplicationTest.java rename to firetweet.extension.twitlonger/src/androidTest/java/org/mariotaku/extension/twitlonger/ApplicationTest.java index cf1837ec..34fe2cdb 100644 --- a/twidere.extension.twitlonger/src/androidTest/java/org/mariotaku/extension/twitlonger/ApplicationTest.java +++ b/firetweet.extension.twitlonger/src/androidTest/java/org/mariotaku/extension/twitlonger/ApplicationTest.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -29,4 +29,4 @@ public class ApplicationTest extends ApplicationTestCase { public ApplicationTest() { super(Application.class); } -} \ No newline at end of file +} diff --git a/twidere.extension.twitlonger/src/main/AndroidManifest.xml b/firetweet.extension.twitlonger/src/main/AndroidManifest.xml similarity index 78% rename from twidere.extension.twitlonger/src/main/AndroidManifest.xml rename to firetweet.extension.twitlonger/src/main/AndroidManifest.xml index 5e9d5eff..116952d4 100644 --- a/twidere.extension.twitlonger/src/main/AndroidManifest.xml +++ b/firetweet.extension.twitlonger/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.getlantern.firetweet.extension.twitlonger"> @@ -11,14 +11,14 @@ android:label="@string/app_name" android:theme="@style/Theme"> - + @@ -27,14 +27,14 @@ android:name=".TwitLongerReaderActivity" android:label="@string/extension_reader_name"> - + @@ -66,7 +66,7 @@ android:name=".AboutActivity" android:label="@string/about"> - + @@ -76,20 +76,20 @@ android:name=".TwitLongerService" tools:ignore="ExportedService"> - + + android:permission="org.getlantern.firetweet.permission.SHORTEN_STATUS"> - + - \ No newline at end of file + diff --git a/twidere.extension.twitlonger/src/main/aidl/org/mariotaku/twidere/ITweetShortener.aidl b/firetweet.extension.twitlonger/src/main/aidl/org/getlantern/firetweet/ITweetShortener.aidl similarity index 91% rename from twidere.extension.twitlonger/src/main/aidl/org/mariotaku/twidere/ITweetShortener.aidl rename to firetweet.extension.twitlonger/src/main/aidl/org/getlantern/firetweet/ITweetShortener.aidl index ad80c6d0..b5005f00 100644 --- a/twidere.extension.twitlonger/src/main/aidl/org/mariotaku/twidere/ITweetShortener.aidl +++ b/firetweet.extension.twitlonger/src/main/aidl/org/getlantern/firetweet/ITweetShortener.aidl @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere; +package org.getlantern.firetweet; interface ITweetShortener { String shorten(String text, String screen_name, long in_reply_to_status_id); diff --git a/twidere.extension.twitlonger/src/main/java/com/twitter/Extractor.java b/firetweet.extension.twitlonger/src/main/java/com/twitter/Extractor.java similarity index 100% rename from twidere.extension.twitlonger/src/main/java/com/twitter/Extractor.java rename to firetweet.extension.twitlonger/src/main/java/com/twitter/Extractor.java diff --git a/twidere.extension.twitlonger/src/main/java/com/twitter/Regex.java b/firetweet.extension.twitlonger/src/main/java/com/twitter/Regex.java similarity index 100% rename from twidere.extension.twitlonger/src/main/java/com/twitter/Regex.java rename to firetweet.extension.twitlonger/src/main/java/com/twitter/Regex.java diff --git a/twidere.extension.twitlonger/src/main/java/com/twitter/Validator.java b/firetweet.extension.twitlonger/src/main/java/com/twitter/Validator.java similarity index 100% rename from twidere.extension.twitlonger/src/main/java/com/twitter/Validator.java rename to firetweet.extension.twitlonger/src/main/java/com/twitter/Validator.java diff --git a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/AboutActivity.java b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/AboutActivity.java similarity index 85% rename from twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/AboutActivity.java rename to firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/AboutActivity.java index 57ea478d..ee1e03dc 100644 --- a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/AboutActivity.java +++ b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/AboutActivity.java @@ -1,4 +1,4 @@ -package org.mariotaku.twidere.extension.twitlonger; +package org.getlantern.firetweet.extension.twitlonger; import android.os.Bundle; import android.preference.PreferenceActivity; diff --git a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/Constants.java b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/Constants.java similarity index 74% rename from twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/Constants.java rename to firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/Constants.java index 564cf098..49d3756b 100644 --- a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/Constants.java +++ b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/Constants.java @@ -1,4 +1,4 @@ -package org.mariotaku.twidere.extension.twitlonger; +package org.getlantern.firetweet.extension.twitlonger; public interface Constants { diff --git a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TLStatusShortenerService.java b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TLStatusShortenerService.java similarity index 82% rename from twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TLStatusShortenerService.java rename to firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TLStatusShortenerService.java index 1a3c4762..dc2141f7 100644 --- a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TLStatusShortenerService.java +++ b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TLStatusShortenerService.java @@ -1,16 +1,16 @@ -package org.mariotaku.twidere.extension.twitlonger; +package org.getlantern.firetweet.extension.twitlonger; import android.app.Service; import android.content.Intent; import android.os.IBinder; import android.os.RemoteException; -import org.mariotaku.twidere.IStatusShortener; -import org.mariotaku.twidere.extension.twitlonger.TwitLonger.TwitLongerException; -import org.mariotaku.twidere.extension.twitlonger.TwitLonger.TwitLongerResponse; -import org.mariotaku.twidere.model.ParcelableAccount; -import org.mariotaku.twidere.model.ParcelableStatusUpdate; -import org.mariotaku.twidere.model.StatusShortenResult; +import org.getlantern.firetweet.IStatusShortener; +import org.getlantern.firetweet.extension.twitlonger.TwitLonger.TwitLongerException; +import org.getlantern.firetweet.extension.twitlonger.TwitLonger.TwitLongerResponse; +import org.getlantern.firetweet.model.ParcelableAccount; +import org.getlantern.firetweet.model.ParcelableStatusUpdate; +import org.getlantern.firetweet.model.StatusShortenResult; import java.lang.ref.WeakReference; diff --git a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLonger.java b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TwitLonger.java similarity index 99% rename from twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLonger.java rename to firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TwitLonger.java index 0310de58..98fb136a 100644 --- a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLonger.java +++ b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TwitLonger.java @@ -1,4 +1,4 @@ -package org.mariotaku.twidere.extension.twitlonger; +package org.getlantern.firetweet.extension.twitlonger; import org.apache.http.HttpResponse; import org.apache.http.NameValuePair; diff --git a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLongerPostActivity.java b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TwitLongerPostActivity.java similarity index 87% rename from twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLongerPostActivity.java rename to firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TwitLongerPostActivity.java index a624ea60..ce76a883 100644 --- a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLongerPostActivity.java +++ b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TwitLongerPostActivity.java @@ -1,9 +1,9 @@ -package org.mariotaku.twidere.extension.twitlonger; +package org.getlantern.firetweet.extension.twitlonger; -import org.mariotaku.twidere.Twidere; -import org.mariotaku.twidere.extension.twitlonger.TwitLonger.TwitLongerException; -import org.mariotaku.twidere.extension.twitlonger.TwitLonger.TwitLongerResponse; -import org.mariotaku.twidere.model.ComposingStatus; +import org.getlantern.firetweet.Firetweet; +import org.getlantern.firetweet.extension.twitlonger.TwitLonger.TwitLongerException; +import org.getlantern.firetweet.extension.twitlonger.TwitLonger.TwitLongerResponse; +import org.getlantern.firetweet.model.ComposingStatus; import android.app.Activity; import android.content.Intent; @@ -37,7 +37,7 @@ public void onClick(final View view) { mTwitLongerPostTask = new TwitLongerPostTask(); mTwitLongerPostTask.execute(); } else { - Twidere.replaceComposeActivityText(this, mResult); + Firetweet.replaceComposeActivityText(this, mResult); } break; } @@ -52,7 +52,7 @@ protected void onCreate(final Bundle savedInstanceState) { mPreview = (TextView) findViewById(R.id.text); mActionButton = (ImageButton) findViewById(R.id.action); mProgress = (ProgressBar) findViewById(R.id.progress); - mStatus = Twidere.getComposingStatusFromIntent(getIntent()); + mStatus = Firetweet.getComposingStatusFromIntent(getIntent()); if (mStatus == null) { finish(); return; diff --git a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLongerReaderActivity.java b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TwitLongerReaderActivity.java similarity index 88% rename from twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLongerReaderActivity.java rename to firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TwitLongerReaderActivity.java index b2137d9d..ed3dc421 100644 --- a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLongerReaderActivity.java +++ b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TwitLongerReaderActivity.java @@ -1,12 +1,12 @@ -package org.mariotaku.twidere.extension.twitlonger; +package org.getlantern.firetweet.extension.twitlonger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.mariotaku.twidere.Twidere; -import org.mariotaku.twidere.extension.twitlonger.TwitLonger.TwitLongerException; -import org.mariotaku.twidere.extension.twitlonger.TwitLonger.TwitLongerResponse; -import org.mariotaku.twidere.model.ParcelableStatus; +import org.getlantern.firetweet.Firetweet; +import org.getlantern.firetweet.extension.twitlonger.TwitLonger.TwitLongerException; +import org.getlantern.firetweet.extension.twitlonger.TwitLonger.TwitLongerResponse; +import org.getlantern.firetweet.model.ParcelableStatus; import android.app.Activity; import android.content.Intent; @@ -72,11 +72,11 @@ protected void onCreate(final Bundle savedInstanceState) { mPreview = (TextView) findViewById(R.id.text); mActionButton = (ImageButton) findViewById(R.id.action); mProgress = (ProgressBar) findViewById(R.id.progress); - mResult = savedInstanceState != null ? savedInstanceState.getString(Twidere.EXTRA_TEXT) : null; - mUser = savedInstanceState != null ? savedInstanceState.getString(Twidere.EXTRA_USER) : null; + mResult = savedInstanceState != null ? savedInstanceState.getString(Firetweet.EXTRA_TEXT) : null; + mUser = savedInstanceState != null ? savedInstanceState.getString(Firetweet.EXTRA_USER) : null; if (mResult == null || mUser == null) { - if (Twidere.INTENT_ACTION_EXTENSION_OPEN_STATUS.equals(action)) { - mStatus = Twidere.getStatusFromIntent(getIntent()); + if (Firetweet.INTENT_ACTION_EXTENSION_OPEN_STATUS.equals(action)) { + mStatus = Firetweet.getStatusFromIntent(getIntent()); if (mStatus == null || mStatus.text_html == null) { finish(); return; @@ -107,8 +107,8 @@ protected void onCreate(final Bundle savedInstanceState) { @Override protected void onSaveInstanceState(final Bundle outState) { - outState.putString(Twidere.EXTRA_TEXT, mResult); - outState.putString(Twidere.EXTRA_USER, mUser); + outState.putString(Firetweet.EXTRA_TEXT, mResult); + outState.putString(Firetweet.EXTRA_USER, mUser); super.onSaveInstanceState(outState); } diff --git a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLongerService.java b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TwitLongerService.java similarity index 84% rename from twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLongerService.java rename to firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TwitLongerService.java index 262dc641..9c1fd7dc 100644 --- a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/TwitLongerService.java +++ b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/TwitLongerService.java @@ -1,10 +1,10 @@ -package org.mariotaku.twidere.extension.twitlonger; +package org.getlantern.firetweet.extension.twitlonger; import java.lang.ref.WeakReference; -import org.mariotaku.twidere.ITweetShortener; -import org.mariotaku.twidere.extension.twitlonger.TwitLonger.TwitLongerException; -import org.mariotaku.twidere.extension.twitlonger.TwitLonger.TwitLongerResponse; +import org.getlantern.firetweet.ITweetShortener; +import org.getlantern.firetweet.extension.twitlonger.TwitLonger.TwitLongerException; +import org.getlantern.firetweet.extension.twitlonger.TwitLonger.TwitLongerResponse; import android.app.Service; import android.content.Intent; diff --git a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/Utils.java b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/Utils.java similarity index 92% rename from twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/Utils.java rename to firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/Utils.java index ed873d10..21197655 100644 --- a/twidere.extension.twitlonger/src/main/java/org/mariotaku/twidere/extension/twitlonger/Utils.java +++ b/firetweet.extension.twitlonger/src/main/java/org/getlantern/firetweet/extension/twitlonger/Utils.java @@ -1,4 +1,4 @@ -package org.mariotaku.twidere.extension.twitlonger; +package org.getlantern.firetweet.extension.twitlonger; import java.util.regex.Pattern; diff --git a/twidere.extension.twitlonger/src/main/res/drawable-hdpi/ic_extension_twitlonger.png b/firetweet.extension.twitlonger/src/main/res/drawable-hdpi/ic_extension_twitlonger.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-hdpi/ic_extension_twitlonger.png rename to firetweet.extension.twitlonger/src/main/res/drawable-hdpi/ic_extension_twitlonger.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-hdpi/ic_launcher.png b/firetweet.extension.twitlonger/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-hdpi/ic_launcher.png rename to firetweet.extension.twitlonger/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-ldpi/ic_launcher.png b/firetweet.extension.twitlonger/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-ldpi/ic_launcher.png rename to firetweet.extension.twitlonger/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-mdpi/ic_extension_twitlonger.png b/firetweet.extension.twitlonger/src/main/res/drawable-mdpi/ic_extension_twitlonger.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-mdpi/ic_extension_twitlonger.png rename to firetweet.extension.twitlonger/src/main/res/drawable-mdpi/ic_extension_twitlonger.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-mdpi/ic_launcher.png b/firetweet.extension.twitlonger/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-mdpi/ic_launcher.png rename to firetweet.extension.twitlonger/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-xhdpi/ic_extension_twitlonger.png b/firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/ic_extension_twitlonger.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-xhdpi/ic_extension_twitlonger.png rename to firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/ic_extension_twitlonger.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-xhdpi/ic_launcher.png b/firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-xhdpi/ic_launcher.png rename to firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-xhdpi/ic_menu_mark.png b/firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/ic_menu_mark.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-xhdpi/ic_menu_mark.png rename to firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/ic_menu_mark.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-xhdpi/ic_menu_send.png b/firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/ic_menu_send.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-xhdpi/ic_menu_send.png rename to firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/ic_menu_send.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-xhdpi/ic_menu_share.png b/firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/ic_menu_share.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-xhdpi/ic_menu_share.png rename to firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/ic_menu_share.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-xhdpi/list_focused_holo.9.png b/firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/list_focused_holo.9.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-xhdpi/list_focused_holo.9.png rename to firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/list_focused_holo.9.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-xhdpi/list_longpressed_holo.9.png b/firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/list_longpressed_holo.9.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-xhdpi/list_longpressed_holo.9.png rename to firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/list_longpressed_holo.9.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-xhdpi/list_pressed_holo.9.png b/firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/list_pressed_holo.9.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-xhdpi/list_pressed_holo.9.png rename to firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/list_pressed_holo.9.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png b/firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png rename to firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-xhdpi/popup_holo_dark.9.png b/firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/popup_holo_dark.9.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-xhdpi/popup_holo_dark.9.png rename to firetweet.extension.twitlonger/src/main/res/drawable-xhdpi/popup_holo_dark.9.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-xxhdpi/ic_extension_twitlonger.png b/firetweet.extension.twitlonger/src/main/res/drawable-xxhdpi/ic_extension_twitlonger.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-xxhdpi/ic_extension_twitlonger.png rename to firetweet.extension.twitlonger/src/main/res/drawable-xxhdpi/ic_extension_twitlonger.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable-xxhdpi/ic_launcher.png b/firetweet.extension.twitlonger/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable-xxhdpi/ic_launcher.png rename to firetweet.extension.twitlonger/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/twidere.extension.twitlonger/src/main/res/drawable/list_selector_background_transition_holo.xml b/firetweet.extension.twitlonger/src/main/res/drawable/list_selector_background_transition_holo.xml similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable/list_selector_background_transition_holo.xml rename to firetweet.extension.twitlonger/src/main/res/drawable/list_selector_background_transition_holo.xml diff --git a/twidere.extension.twitlonger/src/main/res/drawable/list_selector_holo_dark.xml b/firetweet.extension.twitlonger/src/main/res/drawable/list_selector_holo_dark.xml similarity index 100% rename from twidere.extension.twitlonger/src/main/res/drawable/list_selector_holo_dark.xml rename to firetweet.extension.twitlonger/src/main/res/drawable/list_selector_holo_dark.xml diff --git a/twidere.extension.twitlonger/src/main/res/layout/main.xml b/firetweet.extension.twitlonger/src/main/res/layout/main.xml similarity index 100% rename from twidere.extension.twitlonger/src/main/res/layout/main.xml rename to firetweet.extension.twitlonger/src/main/res/layout/main.xml diff --git a/twidere.extension.twitlonger/src/main/res/values-v11/themes.xml b/firetweet.extension.twitlonger/src/main/res/values-v11/themes.xml similarity index 100% rename from twidere.extension.twitlonger/src/main/res/values-v11/themes.xml rename to firetweet.extension.twitlonger/src/main/res/values-v11/themes.xml diff --git a/twidere.extension.twitlonger/src/main/res/values/strings.xml b/firetweet.extension.twitlonger/src/main/res/values/strings.xml similarity index 89% rename from twidere.extension.twitlonger/src/main/res/values/strings.xml rename to firetweet.extension.twitlonger/src/main/res/values/strings.xml index 16ba79cb..8ae2a4fb 100644 --- a/twidere.extension.twitlonger/src/main/res/values/strings.xml +++ b/firetweet.extension.twitlonger/src/main/res/values/strings.xml @@ -2,7 +2,7 @@ TwitLonger extension by Mariotaku - Twidere TwitLonger Extension + Firetweet TwitLonger Extension Post TwitLonger tweet Read TwitLonger tweet TwitLonger @@ -13,4 +13,4 @@ Donate About - \ No newline at end of file + diff --git a/twidere.extension.twitlonger/src/main/res/values/themes.xml b/firetweet.extension.twitlonger/src/main/res/values/themes.xml similarity index 100% rename from twidere.extension.twitlonger/src/main/res/values/themes.xml rename to firetweet.extension.twitlonger/src/main/res/values/themes.xml diff --git a/twidere.extension.twitlonger/src/main/res/xml/about.xml b/firetweet.extension.twitlonger/src/main/res/xml/about.xml similarity index 90% rename from twidere.extension.twitlonger/src/main/res/xml/about.xml rename to firetweet.extension.twitlonger/src/main/res/xml/about.xml index 7fe14883..963c1de8 100644 --- a/twidere.extension.twitlonger/src/main/res/xml/about.xml +++ b/firetweet.extension.twitlonger/src/main/res/xml/about.xml @@ -9,7 +9,7 @@ + android:data="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mariotaku.lee%40gmail%2ecom&item_name=Donate%20to%20Firetweet&currency_code=USD"/> - \ No newline at end of file + diff --git a/twidere.library.extension/.gitignore b/firetweet.library.extension/.gitignore similarity index 100% rename from twidere.library.extension/.gitignore rename to firetweet.library.extension/.gitignore diff --git a/twidere.component.twitter4j.streaming/build.gradle b/firetweet.library.extension/build.gradle similarity index 92% rename from twidere.component.twitter4j.streaming/build.gradle rename to firetweet.library.extension/build.gradle index 47059764..8e7ddd98 100644 --- a/twidere.component.twitter4j.streaming/build.gradle +++ b/firetweet.library.extension/build.gradle @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -36,6 +36,6 @@ android { } dependencies { - compile project(':twidere.component.twitter4j') + compile project(':firetweet.component.common') compile fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/twidere.library.extension/proguard-rules.pro b/firetweet.library.extension/proguard-rules.pro similarity index 100% rename from twidere.library.extension/proguard-rules.pro rename to firetweet.library.extension/proguard-rules.pro diff --git a/twidere.extension.push.xiaomi/src/androidTest/java/org/mariotaku/twidere/extension/push/xiaomi/ApplicationTest.java b/firetweet.library.extension/src/androidTest/java/org/getlantern/firetweet/library/extension/ApplicationTest.java similarity index 91% rename from twidere.extension.push.xiaomi/src/androidTest/java/org/mariotaku/twidere/extension/push/xiaomi/ApplicationTest.java rename to firetweet.library.extension/src/androidTest/java/org/getlantern/firetweet/library/extension/ApplicationTest.java index 2394de50..764a7ee3 100644 --- a/twidere.extension.push.xiaomi/src/androidTest/java/org/mariotaku/twidere/extension/push/xiaomi/ApplicationTest.java +++ b/firetweet.library.extension/src/androidTest/java/org/getlantern/firetweet/library/extension/ApplicationTest.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.extension.push.xiaomi; +package org.getlantern.firetweet.library.extension; import android.app.Application; import android.test.ApplicationTestCase; @@ -29,4 +29,4 @@ public class ApplicationTest extends ApplicationTestCase { public ApplicationTest() { super(Application.class); } -} \ No newline at end of file +} diff --git a/twidere.library.extension/src/main/AndroidManifest.xml b/firetweet.library.extension/src/main/AndroidManifest.xml similarity index 87% rename from twidere.library.extension/src/main/AndroidManifest.xml rename to firetweet.library.extension/src/main/AndroidManifest.xml index e08e92ce..1d421271 100644 --- a/twidere.library.extension/src/main/AndroidManifest.xml +++ b/firetweet.library.extension/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - \ No newline at end of file + diff --git a/twidere.library.extension/src/main/java/org/mariotaku/twidere/Twidere.java b/firetweet.library.extension/src/main/java/org/getlantern/firetweet/Firetweet.java similarity index 82% rename from twidere.library.extension/src/main/java/org/mariotaku/twidere/Twidere.java rename to firetweet.library.extension/src/main/java/org/getlantern/firetweet/Firetweet.java index 2010214a..c4acf3b1 100644 --- a/twidere.library.extension/src/main/java/org/mariotaku/twidere/Twidere.java +++ b/firetweet.library.extension/src/main/java/org/getlantern/firetweet/Firetweet.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere; +package org.getlantern.firetweet; import android.app.Activity; import android.content.ContentResolver; @@ -31,13 +31,13 @@ import android.os.ParcelFileDescriptor; import android.support.annotation.NonNull; -import org.mariotaku.twidere.model.ComposingStatus; -import org.mariotaku.twidere.model.ParcelableStatus; -import org.mariotaku.twidere.model.ParcelableUser; -import org.mariotaku.twidere.model.ParcelableUserList; -import org.mariotaku.twidere.provider.TwidereDataStore; -import org.mariotaku.twidere.provider.TwidereDataStore.DNS; -import org.mariotaku.twidere.util.TwidereArrayUtils; +import org.getlantern.firetweet.model.ComposingStatus; +import org.getlantern.firetweet.model.ParcelableStatus; +import org.getlantern.firetweet.model.ParcelableUser; +import org.getlantern.firetweet.model.ParcelableUserList; +import org.getlantern.firetweet.provider.FiretweetDataStore; +import org.getlantern.firetweet.provider.FiretweetDataStore.DNS; +import org.getlantern.firetweet.util.FiretweetArrayUtils; import java.net.Inet4Address; import java.net.Inet6Address; @@ -48,7 +48,7 @@ import static android.text.TextUtils.isEmpty; @SuppressWarnings("unused") -public final class Twidere implements TwidereConstants { +public final class Firetweet implements FiretweetConstants { public static void appendComposeActivityText(final Activity activity, final String text) { if (activity == null) return; @@ -63,7 +63,7 @@ public static void appendComposeActivityText(final Activity activity, final Stri public static ParcelFileDescriptor getCachedImageFd(final Context context, final String url) { if (context == null || url == null) return null; final ContentResolver resolver = context.getContentResolver(); - final Uri.Builder builder = TwidereDataStore.CachedImages.CONTENT_URI.buildUpon(); + final Uri.Builder builder = FiretweetDataStore.CachedImages.CONTENT_URI.buildUpon(); builder.appendQueryParameter(QUERY_PARAM_URL, url); try { return resolver.openFileDescriptor(builder.build(), "r"); @@ -75,13 +75,13 @@ public static ParcelFileDescriptor getCachedImageFd(final Context context, final public static String getCachedImagePath(final Context context, final String url) { if (context == null || url == null) return null; final ContentResolver resolver = context.getContentResolver(); - final Uri.Builder builder = TwidereDataStore.CachedImages.CONTENT_URI.buildUpon(); + final Uri.Builder builder = FiretweetDataStore.CachedImages.CONTENT_URI.buildUpon(); builder.appendQueryParameter(QUERY_PARAM_URL, url); - final Cursor cur = resolver.query(builder.build(), TwidereDataStore.CachedImages.MATRIX_COLUMNS, null, null, null); + final Cursor cur = resolver.query(builder.build(), FiretweetDataStore.CachedImages.MATRIX_COLUMNS, null, null, null); if (cur == null) return null; try { if (cur.getCount() == 0) return null; - final int path_idx = cur.getColumnIndex(TwidereDataStore.CachedImages.PATH); + final int path_idx = cur.getColumnIndex(FiretweetDataStore.CachedImages.PATH); cur.moveToFirst(); return cur.getString(path_idx); } finally { @@ -92,7 +92,7 @@ public static String getCachedImagePath(final Context context, final String url) public static ParcelFileDescriptor getCacheFileFd(final Context context, final String name) { if (context == null || name == null) return null; final ContentResolver resolver = context.getContentResolver(); - final Uri.Builder builder = TwidereDataStore.CacheFiles.CONTENT_URI.buildUpon(); + final Uri.Builder builder = FiretweetDataStore.CacheFiles.CONTENT_URI.buildUpon(); builder.appendQueryParameter(QUERY_PARAM_NAME, name); try { return resolver.openFileDescriptor(builder.build(), "r"); @@ -106,9 +106,9 @@ public static ComposingStatus getComposingStatusFromIntent(final Intent intent) return new ComposingStatus(intent); } - public static TwidereSharedPreferences getSharedPreferences(final Context context) { + public static FiretweetSharedPreferences getSharedPreferences(final Context context) { if (context == null) return null; - return new TwidereSharedPreferences(context); + return new FiretweetSharedPreferences(context); } public static ParcelableStatus getStatusFromIntent(final Intent intent) { @@ -138,16 +138,16 @@ public static boolean isPermissionGranted(final Context context) { } if (info.metaData == null) return false; final String[] required = parsePermissions(info.metaData.getString(METADATA_KEY_EXTENSION_PERMISSIONS)); - final Cursor c = resolver.query(TwidereDataStore.Permissions.CONTENT_URI, null, null, null, null); + final Cursor c = resolver.query(FiretweetDataStore.Permissions.CONTENT_URI, null, null, null, null); if (c == null) return false; try { c.moveToFirst(); - final int idxPackageName = c.getColumnIndex(TwidereDataStore.Permissions.PACKAGE_NAME), idxPermissions = c - .getColumnIndex(TwidereDataStore.Permissions.PERMISSION); + final int idxPackageName = c.getColumnIndex(FiretweetDataStore.Permissions.PACKAGE_NAME), idxPermissions = c + .getColumnIndex(FiretweetDataStore.Permissions.PERMISSION); while (!c.isAfterLast()) { if (pname.equals(c.getString(idxPackageName))) { final String[] permissions = parsePermissions(c.getString(idxPermissions)); - return TwidereArrayUtils.contains(permissions, required); + return FiretweetArrayUtils.contains(permissions, required); } c.moveToNext(); } diff --git a/twidere.library.extension/src/main/java/org/mariotaku/twidere/TwidereSharedPreferences.java b/firetweet.library.extension/src/main/java/org/getlantern/firetweet/FiretweetSharedPreferences.java similarity index 72% rename from twidere.library.extension/src/main/java/org/mariotaku/twidere/TwidereSharedPreferences.java rename to firetweet.library.extension/src/main/java/org/getlantern/firetweet/FiretweetSharedPreferences.java index 60d75f69..86268f5f 100644 --- a/twidere.library.extension/src/main/java/org/mariotaku/twidere/TwidereSharedPreferences.java +++ b/firetweet.library.extension/src/main/java/org/getlantern/firetweet/FiretweetSharedPreferences.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012 Mariotaku Lee * @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere; +package org.getlantern.firetweet; import android.content.ContentResolver; import android.content.Context; @@ -25,25 +25,25 @@ import android.database.Cursor; import android.net.Uri; -import org.mariotaku.twidere.provider.TwidereDataStore; +import org.getlantern.firetweet.provider.FiretweetDataStore; import java.util.HashMap; import java.util.Map; import java.util.Set; -public final class TwidereSharedPreferences implements SharedPreferences { +public final class FiretweetSharedPreferences implements SharedPreferences { private final ContentResolver mResolver; - TwidereSharedPreferences(final Context context) { + FiretweetSharedPreferences(final Context context) { mResolver = context.getContentResolver(); } @Override public boolean contains(final String key) { if (key == null) throw new NullPointerException(); - final Uri uri = Uri.withAppendedPath(TwidereDataStore.Preferences.CONTENT_URI, key); - final Cursor cur = mResolver.query(uri, TwidereDataStore.Preferences.MATRIX_COLUMNS, null, null, null); + final Uri uri = Uri.withAppendedPath(FiretweetDataStore.Preferences.CONTENT_URI, key); + final Cursor cur = mResolver.query(uri, FiretweetDataStore.Preferences.MATRIX_COLUMNS, null, null, null); if (cur == null) return false; try { return cur.getCount() > 0; @@ -59,33 +59,33 @@ public Editor edit() { @Override public Map getAll() { - final Cursor cur = mResolver.query(TwidereDataStore.Preferences.CONTENT_URI, TwidereDataStore.Preferences.MATRIX_COLUMNS, + final Cursor cur = mResolver.query(FiretweetDataStore.Preferences.CONTENT_URI, FiretweetDataStore.Preferences.MATRIX_COLUMNS, null, null, null); if (cur == null) return null; final HashMap map = new HashMap<>(); - final int key_idx = cur.getColumnIndex(TwidereDataStore.Preferences.KEY); - final int value_idx = cur.getColumnIndex(TwidereDataStore.Preferences.VALUE); - final int type_idx = cur.getColumnIndex(TwidereDataStore.Preferences.TYPE); + final int key_idx = cur.getColumnIndex(FiretweetDataStore.Preferences.KEY); + final int value_idx = cur.getColumnIndex(FiretweetDataStore.Preferences.VALUE); + final int type_idx = cur.getColumnIndex(FiretweetDataStore.Preferences.TYPE); cur.moveToFirst(); while (!cur.isAfterLast()) { final Object value; switch (cur.getInt(type_idx)) { - case TwidereDataStore.Preferences.TYPE_BOOLEAN: + case FiretweetDataStore.Preferences.TYPE_BOOLEAN: value = Boolean.valueOf(cur.getString(value_idx)); break; - case TwidereDataStore.Preferences.TYPE_INTEGER: + case FiretweetDataStore.Preferences.TYPE_INTEGER: value = cur.getInt(value_idx); break; - case TwidereDataStore.Preferences.TYPE_LONG: + case FiretweetDataStore.Preferences.TYPE_LONG: value = cur.getLong(value_idx); break; - case TwidereDataStore.Preferences.TYPE_FLOAT: + case FiretweetDataStore.Preferences.TYPE_FLOAT: value = cur.getFloat(value_idx); break; - case TwidereDataStore.Preferences.TYPE_STRING: + case FiretweetDataStore.Preferences.TYPE_STRING: value = cur.getString(value_idx); break; - case TwidereDataStore.Preferences.TYPE_NULL: + case FiretweetDataStore.Preferences.TYPE_NULL: value = null; break; default: @@ -139,13 +139,13 @@ public long getLong(final String key, final long defValue) { } public Object getPreferenceObject(final String key) { - final Uri uri = Uri.withAppendedPath(TwidereDataStore.Preferences.CONTENT_URI, key); - final Cursor cur = mResolver.query(uri, TwidereDataStore.Preferences.MATRIX_COLUMNS, null, null, null); + final Uri uri = Uri.withAppendedPath(FiretweetDataStore.Preferences.CONTENT_URI, key); + final Cursor cur = mResolver.query(uri, FiretweetDataStore.Preferences.MATRIX_COLUMNS, null, null, null); if (cur == null) throw new NullPointerException(); try { - final int key_idx = cur.getColumnIndex(TwidereDataStore.Preferences.KEY); - final int value_idx = cur.getColumnIndex(TwidereDataStore.Preferences.VALUE); - final int type_idx = cur.getColumnIndex(TwidereDataStore.Preferences.TYPE); + final int key_idx = cur.getColumnIndex(FiretweetDataStore.Preferences.KEY); + final int value_idx = cur.getColumnIndex(FiretweetDataStore.Preferences.VALUE); + final int type_idx = cur.getColumnIndex(FiretweetDataStore.Preferences.TYPE); cur.moveToFirst(); while (!cur.isAfterLast()) { if (!key.equals(cur.getString(key_idx))) { @@ -154,22 +154,22 @@ public Object getPreferenceObject(final String key) { } final Object value; switch (cur.getInt(type_idx)) { - case TwidereDataStore.Preferences.TYPE_BOOLEAN: + case FiretweetDataStore.Preferences.TYPE_BOOLEAN: value = Boolean.valueOf(cur.getString(value_idx)); break; - case TwidereDataStore.Preferences.TYPE_INTEGER: + case FiretweetDataStore.Preferences.TYPE_INTEGER: value = cur.getInt(value_idx); break; - case TwidereDataStore.Preferences.TYPE_LONG: + case FiretweetDataStore.Preferences.TYPE_LONG: value = cur.getLong(value_idx); break; - case TwidereDataStore.Preferences.TYPE_FLOAT: + case FiretweetDataStore.Preferences.TYPE_FLOAT: value = cur.getFloat(value_idx); break; - case TwidereDataStore.Preferences.TYPE_STRING: + case FiretweetDataStore.Preferences.TYPE_STRING: value = cur.getString(value_idx); break; - case TwidereDataStore.Preferences.TYPE_NULL: + case FiretweetDataStore.Preferences.TYPE_NULL: value = null; break; default: diff --git a/twidere.library.extension/src/main/java/org/mariotaku/twidere/model/ComposingStatus.java b/firetweet.library.extension/src/main/java/org/getlantern/firetweet/model/ComposingStatus.java similarity index 87% rename from twidere.library.extension/src/main/java/org/mariotaku/twidere/model/ComposingStatus.java rename to firetweet.library.extension/src/main/java/org/getlantern/firetweet/model/ComposingStatus.java index f2dfcf51..cf1cd929 100644 --- a/twidere.library.extension/src/main/java/org/mariotaku/twidere/model/ComposingStatus.java +++ b/firetweet.library.extension/src/main/java/org/getlantern/firetweet/model/ComposingStatus.java @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.model; +package org.getlantern.firetweet.model; import android.content.Intent; -import org.mariotaku.twidere.TwidereConstants; +import org.getlantern.firetweet.FiretweetConstants; -public class ComposingStatus implements TwidereConstants { +public class ComposingStatus implements FiretweetConstants { public final String text, name, screen_name, in_reply_to_screen_name, in_reply_to_name; public final long in_reply_to_id; diff --git a/twidere.wear/.gitignore b/firetweet.wear/.gitignore similarity index 100% rename from twidere.wear/.gitignore rename to firetweet.wear/.gitignore diff --git a/twidere.wear/build.gradle b/firetweet.wear/build.gradle similarity index 93% rename from twidere.wear/build.gradle rename to firetweet.wear/build.gradle index 8718fdc8..eec5fb60 100644 --- a/twidere.wear/build.gradle +++ b/firetweet.wear/build.gradle @@ -1,5 +1,5 @@ /* - * Twidere - Twitter client for Android + * Firetweet - Twitter client for Android * * Copyright (C) 2012-2015 Mariotaku Lee * @@ -24,7 +24,7 @@ apply from: rootProject.file('signing.gradle') android { defaultConfig { - applicationId "org.mariotaku.twidere" + applicationId "org.getlantern.firetweet" minSdkVersion 20 targetSdkVersion 22 versionCode 1 diff --git a/twidere.wear/proguard-rules.pro b/firetweet.wear/proguard-rules.pro similarity index 100% rename from twidere.wear/proguard-rules.pro rename to firetweet.wear/proguard-rules.pro diff --git a/twidere.wear/src/main/AndroidManifest.xml b/firetweet.wear/src/main/AndroidManifest.xml similarity index 93% rename from twidere.wear/src/main/AndroidManifest.xml rename to firetweet.wear/src/main/AndroidManifest.xml index 8577ea6f..b010b2c0 100644 --- a/twidere.wear/src/main/AndroidManifest.xml +++ b/firetweet.wear/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.getlantern.firetweet.extension.wear" > diff --git a/twidere.wear/src/main/java/org/mariotaku/twidere/extension/wear/MainActivity.java b/firetweet.wear/src/main/java/org/getlantern/firetweet/extension/wear/MainActivity.java similarity index 93% rename from twidere.wear/src/main/java/org/mariotaku/twidere/extension/wear/MainActivity.java rename to firetweet.wear/src/main/java/org/getlantern/firetweet/extension/wear/MainActivity.java index 7ff41bdc..2ea54751 100644 --- a/twidere.wear/src/main/java/org/mariotaku/twidere/extension/wear/MainActivity.java +++ b/firetweet.wear/src/main/java/org/getlantern/firetweet/extension/wear/MainActivity.java @@ -1,4 +1,4 @@ -package org.mariotaku.twidere.extension.wear; +package org.getlantern.firetweet.extension.wear; import android.app.Activity; import android.os.Bundle; diff --git a/twidere.wear/src/main/res/drawable-hdpi/ic_launcher.png b/firetweet.wear/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from twidere.wear/src/main/res/drawable-hdpi/ic_launcher.png rename to firetweet.wear/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/twidere.wear/src/main/res/drawable-mdpi/ic_launcher.png b/firetweet.wear/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from twidere.wear/src/main/res/drawable-mdpi/ic_launcher.png rename to firetweet.wear/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/twidere.wear/src/main/res/drawable-xhdpi/ic_launcher.png b/firetweet.wear/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from twidere.wear/src/main/res/drawable-xhdpi/ic_launcher.png rename to firetweet.wear/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/twidere.wear/src/main/res/drawable-xxhdpi/ic_launcher.png b/firetweet.wear/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from twidere.wear/src/main/res/drawable-xxhdpi/ic_launcher.png rename to firetweet.wear/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/twidere.wear/src/main/res/layout/activity_main.xml b/firetweet.wear/src/main/res/layout/activity_main.xml similarity index 88% rename from twidere.wear/src/main/res/layout/activity_main.xml rename to firetweet.wear/src/main/res/layout/activity_main.xml index 0d83a689..ee01abd2 100644 --- a/twidere.wear/src/main/res/layout/activity_main.xml +++ b/firetweet.wear/src/main/res/layout/activity_main.xml @@ -8,6 +8,6 @@ android:layout_height="match_parent" app:rectLayout="@layout/rect_activity_main" app:roundLayout="@layout/round_activity_main" - tools:context="org.mariotaku.twidere.extension.wear.MainActivity" + tools:context="org.getlantern.firetweet.extension.wear.MainActivity" tools:deviceIds="wear"> diff --git a/twidere.wear/src/main/res/layout/rect_activity_main.xml b/firetweet.wear/src/main/res/layout/rect_activity_main.xml similarity index 87% rename from twidere.wear/src/main/res/layout/rect_activity_main.xml rename to firetweet.wear/src/main/res/layout/rect_activity_main.xml index 9cea8975..807a54fb 100644 --- a/twidere.wear/src/main/res/layout/rect_activity_main.xml +++ b/firetweet.wear/src/main/res/layout/rect_activity_main.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="org.mariotaku.twidere.extension.wear.MainActivity" + tools:context="org.getlantern.firetweet.extension.wear.MainActivity" tools:deviceIds="wear_square"> - Twidere Wear Extension + Firetweet Wear Extension MainActivity Hello Round World! Hello Square World! diff --git a/firetweet/build.gradle b/firetweet/build.gradle index 0f68f025..024d6293 100644 --- a/firetweet/build.gradle +++ b/firetweet/build.gradle @@ -108,8 +108,8 @@ dependencies { fdroidCompile 'org.osmdroid:osmdroid-android:4.3' fdroidCompile 'org.slf4j:slf4j-simple:1.7.12' debugCompile 'im.dino:dbinspector:3.1.0@aar' - compile project(':twidere.component.common') - compile project(':twidere.component.nyan') + compile project(':firetweet.component.common') + compile project(':firetweet.component.nyan') compile fileTree(dir: 'libs/main', include: ['*.jar']) // googleCompile fileTree(dir: 'libs/google', include: ['*.jar']) compile('com.crashlytics.sdk.android:crashlytics:2.2.4@aar') { diff --git a/firetweet/twidere-fdroid-release.apk b/firetweet/firetweet-fdroid-release.apk similarity index 100% rename from firetweet/twidere-fdroid-release.apk rename to firetweet/firetweet-fdroid-release.apk diff --git a/firetweet/src/androidTest/AndroidManifest.xml b/firetweet/src/androidTest/AndroidManifest.xml index 1c568777..5817ddd0 100644 --- a/firetweet/src/androidTest/AndroidManifest.xml +++ b/firetweet/src/androidTest/AndroidManifest.xml @@ -16,7 +16,7 @@ --> @@ -37,4 +37,4 @@ android:targetPackage="org.getlantern.firetweet" android:label="Tests for org.getlantern.firetweet"/> - \ No newline at end of file + diff --git a/firetweet/src/androidTest/java/org/getlantern/firetweet/test/FiretweetApplicationTest.java b/firetweet/src/androidTest/java/org/getlantern/firetweet/test/FiretweetApplicationTest.java new file mode 100644 index 00000000..d516f4a4 --- /dev/null +++ b/firetweet/src/androidTest/java/org/getlantern/firetweet/test/FiretweetApplicationTest.java @@ -0,0 +1,20 @@ +package org.getlantern.firetweet.test; + +import android.test.ApplicationTestCase; + +import org.getlantern.firetweet.app.FiretweetApplication; + +/** + * Testing Fundamentals + */ +public class FiretweetApplicationTest extends ApplicationTestCase { + @Override + protected void setUp() throws Exception { + super.setUp(); + } + + public FiretweetApplicationTest() { + super(FiretweetApplication.class); + } + +} diff --git a/firetweet/src/androidTest/java/org/mariotaku/twidere/test/TwidereApplicationTest.java b/firetweet/src/androidTest/java/org/mariotaku/twidere/test/TwidereApplicationTest.java deleted file mode 100644 index 1dd6cb22..00000000 --- a/firetweet/src/androidTest/java/org/mariotaku/twidere/test/TwidereApplicationTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.mariotaku.twidere.test; - -import android.test.ApplicationTestCase; - -import org.mariotaku.twidere.app.TwidereApplication; - -/** - * Testing Fundamentals - */ -public class TwidereApplicationTest extends ApplicationTestCase { - @Override - protected void setUp() throws Exception { - super.setUp(); - } - - public TwidereApplicationTest() { - super(TwidereApplication.class); - } - -} \ No newline at end of file diff --git a/firetweet/src/debug/AndroidManifest.xml b/firetweet/src/debug/AndroidManifest.xml index 4d74188e..835bd04a 100644 --- a/firetweet/src/debug/AndroidManifest.xml +++ b/firetweet/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/drawable/progress_bar_video.xml b/firetweet/src/main/res/drawable/progress_bar_video.xml index 69625931..7b775c36 100644 --- a/firetweet/src/main/res/drawable/progress_bar_video.xml +++ b/firetweet/src/main/res/drawable/progress_bar_video.xml @@ -1,6 +1,6 @@ - \ No newline at end of file + android:visibility="visible"/> diff --git a/firetweet/src/main/res/layout-v21/list_item_preference_header_category.xml b/firetweet/src/main/res/layout-v21/list_item_preference_header_category.xml index 6162f21b..27916fbc 100644 --- a/firetweet/src/main/res/layout-v21/list_item_preference_header_category.xml +++ b/firetweet/src/main/res/layout-v21/list_item_preference_header_category.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/action_item_switch.xml b/firetweet/src/main/res/layout/action_item_switch.xml index b47d5c26..5efdd8a9 100644 --- a/firetweet/src/main/res/layout/action_item_switch.xml +++ b/firetweet/src/main/res/layout/action_item_switch.xml @@ -1,6 +1,6 @@ - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/activity_home.xml b/firetweet/src/main/res/layout/activity_home.xml index 3ce6032b..fcbaf5cd 100644 --- a/firetweet/src/main/res/layout/activity_home.xml +++ b/firetweet/src/main/res/layout/activity_home.xml @@ -1,6 +1,6 @@ - - - - - + - + diff --git a/firetweet/src/main/res/layout/activity_media_viewer.xml b/firetweet/src/main/res/layout/activity_media_viewer.xml index 4b00b16c..b4b61ec3 100644 --- a/firetweet/src/main/res/layout/activity_media_viewer.xml +++ b/firetweet/src/main/res/layout/activity_media_viewer.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/activity_settings_wizard.xml b/firetweet/src/main/res/layout/activity_settings_wizard.xml index 4beebd42..3a0b0060 100644 --- a/firetweet/src/main/res/layout/activity_settings_wizard.xml +++ b/firetweet/src/main/res/layout/activity_settings_wizard.xml @@ -1,6 +1,6 @@ + - - + - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/adapter_item_compose_account.xml b/firetweet/src/main/res/layout/adapter_item_compose_account.xml index 501b4426..12354d98 100644 --- a/firetweet/src/main/res/layout/adapter_item_compose_account.xml +++ b/firetweet/src/main/res/layout/adapter_item_compose_account.xml @@ -1,6 +1,6 @@ - \ No newline at end of file + tools:layout_width="48dp"/> diff --git a/firetweet/src/main/res/layout/adapter_item_dashboard_account.xml b/firetweet/src/main/res/layout/adapter_item_dashboard_account.xml index 9406653b..4cef9f1b 100644 --- a/firetweet/src/main/res/layout/adapter_item_dashboard_account.xml +++ b/firetweet/src/main/res/layout/adapter_item_dashboard_account.xml @@ -1,6 +1,6 @@ - - - + diff --git a/firetweet/src/main/res/layout/adapter_item_media_status.xml b/firetweet/src/main/res/layout/adapter_item_media_status.xml index eb86964f..6c44a9c6 100644 --- a/firetweet/src/main/res/layout/adapter_item_media_status.xml +++ b/firetweet/src/main/res/layout/adapter_item_media_status.xml @@ -1,6 +1,6 @@ - - - - - - - - - - - - - - - + - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/card_item_user.xml b/firetweet/src/main/res/layout/card_item_user.xml index 07e6e54c..a1c02d43 100644 --- a/firetweet/src/main/res/layout/card_item_user.xml +++ b/firetweet/src/main/res/layout/card_item_user.xml @@ -1,6 +1,6 @@ - - - - - - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/card_item_user_compact.xml b/firetweet/src/main/res/layout/card_item_user_compact.xml index d930c7a0..a34de023 100644 --- a/firetweet/src/main/res/layout/card_item_user_compact.xml +++ b/firetweet/src/main/res/layout/card_item_user_compact.xml @@ -1,6 +1,6 @@ - - - - - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/card_item_user_list.xml b/firetweet/src/main/res/layout/card_item_user_list.xml index a2eee8d0..dc69a50e 100644 --- a/firetweet/src/main/res/layout/card_item_user_list.xml +++ b/firetweet/src/main/res/layout/card_item_user_list.xml @@ -1,6 +1,6 @@ - - - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/card_item_user_list_compact.xml b/firetweet/src/main/res/layout/card_item_user_list_compact.xml index 32976690..a5e29087 100644 --- a/firetweet/src/main/res/layout/card_item_user_list_compact.xml +++ b/firetweet/src/main/res/layout/card_item_user_list_compact.xml @@ -1,6 +1,6 @@ - - - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/dialog_host_mapping.xml b/firetweet/src/main/res/layout/dialog_host_mapping.xml index 2066bb79..6be3f240 100644 --- a/firetweet/src/main/res/layout/dialog_host_mapping.xml +++ b/firetweet/src/main/res/layout/dialog_host_mapping.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/drawer_home_quick_menu.xml b/firetweet/src/main/res/layout/drawer_home_quick_menu.xml index c115a78b..974f7dd8 100644 --- a/firetweet/src/main/res/layout/drawer_home_quick_menu.xml +++ b/firetweet/src/main/res/layout/drawer_home_quick_menu.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/edit_user_list_detail.xml b/firetweet/src/main/res/layout/edit_user_list_detail.xml index 360f3771..a46222aa 100644 --- a/firetweet/src/main/res/layout/edit_user_list_detail.xml +++ b/firetweet/src/main/res/layout/edit_user_list_detail.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/fragment_recycler_view.xml b/firetweet/src/main/res/layout/fragment_recycler_view.xml index 185da4ba..b39a1c4b 100644 --- a/firetweet/src/main/res/layout/fragment_recycler_view.xml +++ b/firetweet/src/main/res/layout/fragment_recycler_view.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/grid_item_media_editor.xml b/firetweet/src/main/res/layout/grid_item_media_editor.xml index b32e9100..deafd9c0 100644 --- a/firetweet/src/main/res/layout/grid_item_media_editor.xml +++ b/firetweet/src/main/res/layout/grid_item_media_editor.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + android:visibility="visible"/> diff --git a/firetweet/src/main/res/layout/layout_tab_item.xml b/firetweet/src/main/res/layout/layout_tab_item.xml index 231816d4..a14aced2 100644 --- a/firetweet/src/main/res/layout/layout_tab_item.xml +++ b/firetweet/src/main/res/layout/layout_tab_item.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/layout_user_list_details.xml b/firetweet/src/main/res/layout/layout_user_list_details.xml index 73ba7b8a..7937d134 100644 --- a/firetweet/src/main/res/layout/layout_user_list_details.xml +++ b/firetweet/src/main/res/layout/layout_user_list_details.xml @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/layout_user_list_details_compact.xml b/firetweet/src/main/res/layout/layout_user_list_details_compact.xml index 3a1fc53e..718a1ef4 100644 --- a/firetweet/src/main/res/layout/layout_user_list_details_compact.xml +++ b/firetweet/src/main/res/layout/layout_user_list_details_compact.xml @@ -1,6 +1,6 @@ - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/list_item_custom_tab.xml b/firetweet/src/main/res/layout/list_item_custom_tab.xml index f8dbf778..2d066ea1 100644 --- a/firetweet/src/main/res/layout/list_item_custom_tab.xml +++ b/firetweet/src/main/res/layout/list_item_custom_tab.xml @@ -1,6 +1,6 @@ - - - + - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/list_item_drawer_account.xml b/firetweet/src/main/res/layout/list_item_drawer_account.xml index 4167ca5d..fd7b9763 100644 --- a/firetweet/src/main/res/layout/list_item_drawer_account.xml +++ b/firetweet/src/main/res/layout/list_item_drawer_account.xml @@ -1,6 +1,6 @@ - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/list_item_extra_config.xml b/firetweet/src/main/res/layout/list_item_extra_config.xml index 644aed81..896406f7 100644 --- a/firetweet/src/main/res/layout/list_item_extra_config.xml +++ b/firetweet/src/main/res/layout/list_item_extra_config.xml @@ -1,6 +1,6 @@ - - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/list_item_preference_header_category.xml b/firetweet/src/main/res/layout/list_item_preference_header_category.xml index 12a2922a..46517c25 100644 --- a/firetweet/src/main/res/layout/list_item_preference_header_category.xml +++ b/firetweet/src/main/res/layout/list_item_preference_header_category.xml @@ -1,6 +1,6 @@ + @@ -44,4 +44,4 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold"/> - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/popup_account_selector.xml b/firetweet/src/main/res/layout/popup_account_selector.xml index 8cc76fdf..6e7e0608 100644 --- a/firetweet/src/main/res/layout/popup_account_selector.xml +++ b/firetweet/src/main/res/layout/popup_account_selector.xml @@ -1,6 +1,6 @@ - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/layout/spinner_item_custom_tab_icon.xml b/firetweet/src/main/res/layout/spinner_item_custom_tab_icon.xml index 6af8a41f..7d165f0d 100644 --- a/firetweet/src/main/res/layout/spinner_item_custom_tab_icon.xml +++ b/firetweet/src/main/res/layout/spinner_item_custom_tab_icon.xml @@ -1,6 +1,6 @@ - \ No newline at end of file + diff --git a/firetweet/src/main/res/values-v21/dimens.xml b/firetweet/src/main/res/values-v21/dimens.xml index 822cd846..e0d8701d 100644 --- a/firetweet/src/main/res/values-v21/dimens.xml +++ b/firetweet/src/main/res/values-v21/dimens.xml @@ -1,6 +1,6 @@ - \ No newline at end of file + diff --git a/firetweet/src/main/res/values-v21/styles_base_appcompat.xml b/firetweet/src/main/res/values-v21/styles_base_appcompat.xml index 1247e137..54a3a853 100644 --- a/firetweet/src/main/res/values-v21/styles_base_appcompat.xml +++ b/firetweet/src/main/res/values-v21/styles_base_appcompat.xml @@ -1,6 +1,6 @@ #aaa - \ No newline at end of file + diff --git a/firetweet/src/main/res/values-w820dp/dimens.xml b/firetweet/src/main/res/values-w820dp/dimens.xml index 58e25d3c..d2012257 100644 --- a/firetweet/src/main/res/values-w820dp/dimens.xml +++ b/firetweet/src/main/res/values-w820dp/dimens.xml @@ -1,5 +1,5 @@ + - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/values/styles_base.xml b/firetweet/src/main/res/values/styles_base.xml index 63d6966f..f147abd6 100644 --- a/firetweet/src/main/res/values/styles_base.xml +++ b/firetweet/src/main/res/values/styles_base.xml @@ -1,6 +1,6 @@ - \ No newline at end of file + diff --git a/firetweet/src/main/res/values/styles_base_appcompat.xml b/firetweet/src/main/res/values/styles_base_appcompat.xml index a60778be..1a74b69f 100644 --- a/firetweet/src/main/res/values/styles_base_appcompat.xml +++ b/firetweet/src/main/res/values/styles_base_appcompat.xml @@ -1,6 +1,6 @@ - + @android:color/black - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/values/themes_base.xml b/firetweet/src/main/res/values/themes_base.xml index c06cacd8..6a6478d7 100644 --- a/firetweet/src/main/res/values/themes_base.xml +++ b/firetweet/src/main/res/values/themes_base.xml @@ -1,6 +1,6 @@ - + ?android:colorBackground @color/tertiary_text_mtrl_dark @@ -37,7 +37,7 @@ - + ?android:colorBackground @color/tertiary_text_mtrl_dark @@ -49,7 +49,7 @@ - + ?android:colorBackground @color/tertiary_text_mtrl_dark @@ -61,7 +61,7 @@ - + ?android:colorBackground @color/tertiary_text_mtrl_light @@ -73,7 +73,7 @@ - + ?android:colorBackground @color/tertiary_text_mtrl_light @@ -85,7 +85,7 @@ - + ?android:colorBackground @color/tertiary_text_mtrl_light @@ -97,10 +97,10 @@ - + ?android:colorBackground @color/tertiary_text_mtrl_light @color/tertiary_text_mtrl_dark - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_about.xml b/firetweet/src/main/res/xml/preferences_about.xml index 394028bc..64bb3fa2 100644 --- a/firetweet/src/main/res/xml/preferences_about.xml +++ b/firetweet/src/main/res/xml/preferences_about.xml @@ -4,7 +4,7 @@ - + - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_account_notifications.xml b/firetweet/src/main/res/xml/preferences_account_notifications.xml index 96196eb9..e3fe1c71 100644 --- a/firetweet/src/main/res/xml/preferences_account_notifications.xml +++ b/firetweet/src/main/res/xml/preferences_account_notifications.xml @@ -4,15 +4,15 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:title="@string/notifications"> - - - @@ -20,21 +20,21 @@ - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_cards.xml b/firetweet/src/main/res/xml/preferences_cards.xml index 636cd323..59e712f5 100644 --- a/firetweet/src/main/res/xml/preferences_cards.xml +++ b/firetweet/src/main/res/xml/preferences_cards.xml @@ -7,21 +7,21 @@ android:key="cat_card_preview" android:order="11" android:title="@string/preview"> - + - - - - - - - + @@ -57,32 +57,32 @@ - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_content.xml b/firetweet/src/main/res/xml/preferences_content.xml index e89c91a8..8c9afa9b 100644 --- a/firetweet/src/main/res/xml/preferences_content.xml +++ b/firetweet/src/main/res/xml/preferences_content.xml @@ -8,7 +8,7 @@ - - @@ -34,7 +34,7 @@ - - - - - @@ -120,4 +120,4 @@ android:title="@string/display_sensitive_contents"/> - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_hidden.xml b/firetweet/src/main/res/xml/preferences_hidden.xml index 5f3f9b20..d3f43869 100644 --- a/firetweet/src/main/res/xml/preferences_hidden.xml +++ b/firetweet/src/main/res/xml/preferences_hidden.xml @@ -6,29 +6,29 @@ - - - - - + android:targetClass="org.getlantern.firetweet.activity.SettingsWizardActivity" + android:targetPackage="org.getlantern.firetweet"/> - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_interface.xml b/firetweet/src/main/res/xml/preferences_interface.xml index 5cf10e1c..14d82290 100644 --- a/firetweet/src/main/res/xml/preferences_interface.xml +++ b/firetweet/src/main/res/xml/preferences_interface.xml @@ -6,13 +6,13 @@ - - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_network.xml b/firetweet/src/main/res/xml/preferences_network.xml index de7b52c4..434b46d3 100644 --- a/firetweet/src/main/res/xml/preferences_network.xml +++ b/firetweet/src/main/res/xml/preferences_network.xml @@ -7,18 +7,18 @@ android:key="category_connectivity" android:title="@string/connectivity"> - - - @@ -36,20 +36,20 @@ - - - - @@ -76,17 +76,17 @@ android:key="thumbor_enabled" android:title="@string/thumbor_integration"/> - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_notifications.xml b/firetweet/src/main/res/xml/preferences_notifications.xml index fcc35ff4..9f0105a4 100644 --- a/firetweet/src/main/res/xml/preferences_notifications.xml +++ b/firetweet/src/main/res/xml/preferences_notifications.xml @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:title="@string/notifications"> - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_other.xml b/firetweet/src/main/res/xml/preferences_other.xml index 12468435..e5051a4d 100644 --- a/firetweet/src/main/res/xml/preferences_other.xml +++ b/firetweet/src/main/res/xml/preferences_other.xml @@ -3,29 +3,29 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/other_settings"> - - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_refresh.xml b/firetweet/src/main/res/xml/preferences_refresh.xml index c00ee27c..318c9a32 100644 --- a/firetweet/src/main/res/xml/preferences_refresh.xml +++ b/firetweet/src/main/res/xml/preferences_refresh.xml @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:title="@string/refresh"> - - - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_storage.xml b/firetweet/src/main/res/xml/preferences_storage.xml index a9682eab..6df5ff14 100644 --- a/firetweet/src/main/res/xml/preferences_storage.xml +++ b/firetweet/src/main/res/xml/preferences_storage.xml @@ -9,7 +9,7 @@ android:key="category_storage" android:title="@string/storage"> - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_theme.xml b/firetweet/src/main/res/xml/preferences_theme.xml index 70d12ad0..b6c1f770 100644 --- a/firetweet/src/main/res/xml/preferences_theme.xml +++ b/firetweet/src/main/res/xml/preferences_theme.xml @@ -7,11 +7,11 @@ android:key="cat_theme_preview" android:order="11" android:title="@string/preview"> - - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/preferences_thumbor.xml b/firetweet/src/main/res/xml/preferences_thumbor.xml index b578c79a..1309fdbe 100644 --- a/firetweet/src/main/res/xml/preferences_thumbor.xml +++ b/firetweet/src/main/res/xml/preferences_thumbor.xml @@ -1,6 +1,6 @@
- - - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/settings_wizard_page_tab.xml b/firetweet/src/main/res/xml/settings_wizard_page_tab.xml index 0695b674..86e23eb9 100644 --- a/firetweet/src/main/res/xml/settings_wizard_page_tab.xml +++ b/firetweet/src/main/res/xml/settings_wizard_page_tab.xml @@ -3,13 +3,13 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/tabs"> - - - \ No newline at end of file + diff --git a/firetweet/src/main/res/xml/settings_wizard_page_usage_statistics.xml b/firetweet/src/main/res/xml/settings_wizard_page_usage_statistics.xml index 5a06bc61..85a81a4e 100644 --- a/firetweet/src/main/res/xml/settings_wizard_page_usage_statistics.xml +++ b/firetweet/src/main/res/xml/settings_wizard_page_usage_statistics.xml @@ -1,6 +1,6 @@