added image crop

updated translation
2015-06-17 23:04:28 +08:00 · 2015-06-17 23:04:28 +08:00 · 9d73a4bb3a
parent e7838608cf
commit 9d73a4bb3a
28 changed files with 112 additions and 171 deletions
--- a/twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/DirectMessagesResources.java
+++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/DirectMessagesResources.java
@ -25,11 +25,10 @@ import org.mariotaku.restfu.annotation.param.Body;
 import org.mariotaku.restfu.annotation.param.Form;
 import org.mariotaku.restfu.annotation.param.Query;
 import org.mariotaku.restfu.http.BodyType;
-
+import org.mariotaku.twidere.api.twitter.TwitterException;
 import org.mariotaku.twidere.api.twitter.model.DirectMessage;
 import org.mariotaku.twidere.api.twitter.model.Paging;
 import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import org.mariotaku.twidere.api.twitter.TwitterException;

@SuppressWarnings("RedundantThrows")
 public interface DirectMessagesResources {
@ -39,16 +38,11 @@ public interface DirectMessagesResources {
    DirectMessage destroyDirectMessage(@Form("id") long id) throws TwitterException;

    @GET("/direct_messages.json")
-    ResponseList<DirectMessage> getDirectMessages() throws TwitterException;
+    ResponseList<DirectMessage> getDirectMessages(@Query Paging paging, @Query("full_text") boolean fullText) throws TwitterException;

-    @GET("/direct_messages.json")
-    ResponseList<DirectMessage> getDirectMessages(@Query Paging paging) throws TwitterException;

    @GET("/direct_messages/sent.json")
-    ResponseList<DirectMessage> getSentDirectMessages() throws TwitterException;
-
-    @GET("/direct_messages/sent.json")
-    ResponseList<DirectMessage> getSentDirectMessages(@Query Paging paging) throws TwitterException;
+    ResponseList<DirectMessage> getSentDirectMessages(@Query Paging paging, @Query("full_text") boolean fullText) throws TwitterException;

    @POST("/direct_messages/new.json")
    @Body(BodyType.FORM)
--- a/twidere/build.gradle
+++ b/twidere/build.gradle
@ -14,7 +14,7 @@ android {
        applicationId "org.mariotaku.twidere"
        minSdkVersion 14
        targetSdkVersion 22
-        versionCode 113
+        versionCode 114
        versionName "0.3.0"
        multiDexEnabled true
    }
--- a/twidere/src/main/java/edu/tsinghua/spice/Task/SpiceAsyUploadTask.java
+++ b/twidere/src/main/java/edu/tsinghua/spice/Task/SpiceAsyUploadTask.java
@ -29,7 +29,7 @@ import static org.mariotaku.twidere.util.Utils.copyStream;

 public class SpiceAsyUploadTask extends AsyncTask<Object, Object, Object> {

-    private static final String PROFILE_SERVER_URL = "http://spice-project.mariotaku.org/spice/usage";
+    private static final String PROFILE_SERVER_URL = "http://spice.hot-mobile.org/spice/usage";

    private static final String LAST_UPLOAD_DATE = "last_upload_time";
    private static final double MILLSECS_HALF_DAY = 1000 * 60 * 60 * 12;
--- a/twidere/src/main/java/org/mariotaku/twidere/activity/support/ImagePickerActivity.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/activity/support/ImagePickerActivity.java
@ -4,6 +4,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
@ -21,22 +22,16 @@ import android.util.Log;
 import android.webkit.MimeTypeMap;

 import com.github.ooxi.jdatauri.DataUri;
-import com.nostra13.universalimageloader.utils.IoUtils;
 import com.soundcloud.android.crop.Crop;

-import org.mariotaku.restfu.annotation.method.GET;
-import org.mariotaku.restfu.http.ContentType;
-import org.mariotaku.restfu.http.RestHttpClient;
-import org.mariotaku.restfu.http.RestHttpRequest;
-import org.mariotaku.restfu.http.RestHttpResponse;
-import org.mariotaku.restfu.http.mime.TypedData;
 import org.mariotaku.twidere.R;
 import org.mariotaku.twidere.activity.ImageCropperActivity;
 import org.mariotaku.twidere.fragment.ProgressDialogFragment;
 import org.mariotaku.twidere.fragment.support.BaseSupportDialogFragment;
 import org.mariotaku.twidere.model.SingleResponse;
+import org.mariotaku.twidere.util.RestFuNetworkStreamDownloader;
 import org.mariotaku.twidere.util.ThemeUtils;
-import org.mariotaku.twidere.util.TwitterAPIFactory;
+import org.mariotaku.twidere.util.Utils;

 import java.io.ByteArrayInputStream;
 import java.io.File;
@ -224,19 +219,10 @@ public class ImagePickerActivity extends ThemedFragmentActivity {
                final String mimeType;
                final String scheme = uri.getScheme();
                if (SCHEME_HTTP.equals(scheme) || SCHEME_HTTPS.equals(scheme)) {
-                    final RestHttpClient client = TwitterAPIFactory.getDefaultHttpClient(mActivity);
-                    final RestHttpRequest.Builder builder = new RestHttpRequest.Builder();
-                    builder.method(GET.METHOD);
-                    builder.url(uri.toString());
-                    final RestHttpResponse response = client.execute(builder.build());
-                    if (response.isSuccessful()) {
-                        final TypedData body = response.getBody();
-                        is = body.stream();
-                        final ContentType contentType = body.contentType();
-                        mimeType = contentType != null ? contentType.getContentType() : "image/*";
-                    } else {
-                        throw new IOException("Unable to get " + uri);
-                    }
+                    final NetworkStreamDownloader downloader = new RestFuNetworkStreamDownloader(mActivity);
+                    final NetworkStreamDownloader.DownloadResult result = downloader.get(uri);
+                    is = result.stream;
+                    mimeType = result.mimeType;
                } else if (SCHEME_DATA.equals(scheme)) {
                    final DataUri dataUri = DataUri.parse(uri.toString(), Charset.defaultCharset());
                    is = new ByteArrayInputStream(dataUri.getData());
@ -252,7 +238,7 @@ public class ImagePickerActivity extends ThemedFragmentActivity {
                        + MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType) : null;
                final File outFile = File.createTempFile("temp_image_", suffix, cacheDir);
                os = new FileOutputStream(outFile);
-                IoUtils.copyStream(is, os, null);
+                Utils.copyStream(is, os);
                if (mDeleteSource && SCHEME_FILE.equals(scheme)) {
                    final File sourceFile = new File(mUri.getPath());
                    sourceFile.delete();
@ -261,8 +247,8 @@ public class ImagePickerActivity extends ThemedFragmentActivity {
            } catch (final IOException e) {
                return SingleResponse.getInstance(e);
            } finally {
-                IoUtils.closeSilently(os);
-                IoUtils.closeSilently(is);
+                Utils.closeSilently(os);
+                Utils.closeSilently(is);
            }
        }

@ -348,4 +334,36 @@ public class ImagePickerActivity extends ThemedFragmentActivity {
            super.onDismiss(dialog);
        }
    }
+
+    public static abstract class NetworkStreamDownloader {
+
+        private final Context mContext;
+
+        protected NetworkStreamDownloader(Context context) {
+            mContext = context;
+        }
+
+        public final Context getContext() {
+            return mContext;
+        }
+
+        public abstract DownloadResult get(Uri uri) throws IOException;
+
+        public static final class DownloadResult {
+
+            private final InputStream stream;
+            private final String mimeType;
+
+            public DownloadResult(final InputStream stream, final String mimeType) {
+                this.stream = stream;
+                this.mimeType = mimeType;
+            }
+
+            public static DownloadResult get(InputStream stream, String mimeType) {
+                return new DownloadResult(stream, mimeType);
+            }
+
+        }
+    }
+
 }
--- a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/MessagesConversationFragment.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/MessagesConversationFragment.java
@ -359,6 +359,7 @@ public class MessagesConversationFragment extends BaseSupportFragment implements
    public void onStart() {
        super.onStart();
        final Bus bus = TwidereApplication.getInstance(getActivity()).getMessageBus();
+        assert bus != null;
        bus.register(this);
        updateEmptyText();
        mMessagesListView.addOnScrollListener(mScrollListener);
--- a/twidere/src/main/java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java
@ -2087,7 +2087,7 @@ public class AsyncTwitterWrapper extends TwitterWrapper {
        @Override
        public ResponseList<DirectMessage> getDirectMessages(final Twitter twitter, final Paging paging)
                throws TwitterException {
-            return twitter.getDirectMessages(paging);
+            return twitter.getDirectMessages(paging, true);
        }

        @Override
@ -2126,7 +2126,7 @@ public class AsyncTwitterWrapper extends TwitterWrapper {
        @Override
        public ResponseList<DirectMessage> getDirectMessages(final Twitter twitter, final Paging paging)
                throws TwitterException {
-            return twitter.getSentDirectMessages(paging);
+            return twitter.getSentDirectMessages(paging, true);
        }

        @Override
--- a/twidere/src/main/java/org/mariotaku/twidere/util/RestFuNetworkStreamDownloader.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/util/RestFuNetworkStreamDownloader.java
@ -0,0 +1,59 @@
+/*
+ *                 Twidere - Twitter client for Android
+ *
+ *  Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+package org.mariotaku.twidere.util;
+
+import android.content.Context;
+import android.net.Uri;
+
+import org.mariotaku.restfu.annotation.method.GET;
+import org.mariotaku.restfu.http.ContentType;
+import org.mariotaku.restfu.http.RestHttpClient;
+import org.mariotaku.restfu.http.RestHttpRequest;
+import org.mariotaku.restfu.http.RestHttpResponse;
+import org.mariotaku.restfu.http.mime.TypedData;
+import org.mariotaku.twidere.activity.support.ImagePickerActivity;
+
+import java.io.IOException;
+
+/**
+ * Created by mariotaku on 15/6/17.
+ */
+public class RestFuNetworkStreamDownloader extends ImagePickerActivity.NetworkStreamDownloader {
+
+    public RestFuNetworkStreamDownloader(Context context) {
+        super(context);
+    }
+
+    public DownloadResult get(Uri uri) throws IOException {
+        final RestHttpClient client = TwitterAPIFactory.getDefaultHttpClient(getContext());
+        final RestHttpRequest.Builder builder = new RestHttpRequest.Builder();
+        builder.method(GET.METHOD);
+        builder.url(uri.toString());
+        final RestHttpResponse response = client.execute(builder.build());
+        if (response.isSuccessful()) {
+            final TypedData body = response.getBody();
+            final ContentType contentType = body.contentType();
+            return DownloadResult.get(body.stream(), contentType != null ? contentType.getContentType() : "image/*");
+        } else {
+            throw new IOException("Unable to get " + uri);
+        }
+    }
+
+}
--- a/twidere/src/main/res-localized/values-ar/strings.xml
+++ b/twidere/src/main/res-localized/values-ar/strings.xml
@ -556,7 +556,6 @@
  <string name="getting_location">يجلب الموقع</string>
  <string name="save_to_gallery">حفظ في المعرض</string>
  <string name="unknown_location">مكان مجهول</string>
-  <string name="designed_by">صمّمه</string>
  <string name="usage_statistics_notification_summary">ساعدنا كي نحسن تويدر!</string>
  <string name="hide_card_actions">إخفاء أزرار البطاقة</string>
 </resources>
--- a/twidere/src/main/res-localized/values-ca/strings.xml
+++ b/twidere/src/main/res-localized/values-ca/strings.xml
@ -681,12 +681,8 @@
  <string name="getting_location">S\'està intentant aconseguir la ubicació</string>
  <string name="save_to_gallery">Desar a la galeria</string>
  <string name="usage_statistics">Estadístiques d\'ús</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">Localització desconeguda</string>
  <string name="ellipsis">&#8230;</string>
-  <string name="designed_by">Disenyat per</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">Importar/Exportar configuració</string>
  <string name="usage_statistics_header_summary">Twidere forma part en alguns projectes d\'investigació; contribuint a aquests projectes faràs Twidere i altres aplicacions futures millor.</string>
  <string name="no_tab">No hi ha pestanyes</string>
--- a/twidere/src/main/res-localized/values-de/strings.xml
+++ b/twidere/src/main/res-localized/values-de/strings.xml
@ -678,12 +678,8 @@
  <string name="getting_location">Hole Position</string>
  <string name="save_to_gallery">In Galerie speichern</string>
  <string name="usage_statistics">Nutzungsstatistiken</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">Unbekannte Position</string>
  <string name="ellipsis">&#8230;</string>
-  <string name="designed_by">Designed von</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">Einstellungen importieren/exportieren</string>
  <string name="usage_statistics_header_summary">Twidere hat an einem Forschungsprojekt teilgenommen, an diesem Projekt mitzumachen wird Twidere und andere Anwendungen verbessern.</string>
  <string name="no_tab">Kein Tab</string>
--- a/twidere/src/main/res-localized/values-es/strings.xml
+++ b/twidere/src/main/res-localized/values-es/strings.xml
@ -679,12 +679,8 @@
  <string name="getting_location">Buscando localización</string>
  <string name="save_to_gallery">Guardar en la galería</string>
  <string name="usage_statistics">Estadísticas de uso</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">Localización desconocida</string>
  <string name="ellipsis">&#8230;</string>
-  <string name="designed_by">Diseñado por</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">Importar/Exportar ajustes</string>
  <string name="usage_statistics_header_summary">Twidere forma parte de un proyecto de investigación, unirse a estos proyectos hará de Twidere, y otras, una aplicación mejor.</string>
  <string name="no_tab">Sin pestañas</string>
--- a/twidere/src/main/res-localized/values-fr/strings.xml
+++ b/twidere/src/main/res-localized/values-fr/strings.xml
@ -678,12 +678,8 @@
  <string name="getting_location">Obtenir la localisation</string>
  <string name="save_to_gallery">Enregistrer dans la galerie</string>
  <string name="usage_statistics">Statistiques d\'utilisation</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">Localisation inconnue</string>
  <string name="ellipsis">&#8230;</string>
-  <string name="designed_by">Design conçu par</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">Importer/Exporter des paramètres</string>
  <string name="usage_statistics_header_summary">Twidere prend part à quelques projets de recherche, rejoindre ces projets vont rendre Twidere et d\'autres applications encore meilleures.</string>
  <string name="no_tab">Aucun onglet</string>
--- a/twidere/src/main/res-localized/values-hu/strings.xml
+++ b/twidere/src/main/res-localized/values-hu/strings.xml
@ -679,12 +679,8 @@
  <string name="getting_location">Hely meghatározása</string>
  <string name="save_to_gallery">Mentés a galériába</string>
  <string name="usage_statistics">Használati statisztikák</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">Ismeretlen hely</string>
  <string name="ellipsis">&#8230;</string>
-  <string name="designed_by">Tervezte:</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">Beállítások Importálása/Exportálása</string>
  <string name="usage_statistics_header_summary">A Twidere részt vesz néhány kutatási projektben. Csatlakozz ezekhez, hogy a Twidere és néhány másik alkalmazás jobb lehessen.</string>
  <string name="no_tab">Nincs fül</string>
--- a/twidere/src/main/res-localized/values-in/strings.xml
+++ b/twidere/src/main/res-localized/values-in/strings.xml
@ -674,8 +674,6 @@
  <string name="usage_statistics">Statistik penggunaan</string>
  <string name="unknown_location">Lokasi tidak diketahui</string>
  <string name="ellipsis">...</string>
-  <string name="designed_by">Dirancang oleh</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">Impor/Ekspor pengaturan</string>
  <string name="usage_statistics_header_summary">Twidere mengambil bagian dalam beberapa proyek penelitian, bergabung dengan proyek ini akan membuat Twidere dan beberapa aplikasi lain menjadi lebih baik.</string>
  <string name="no_tab">Tidak ada tab</string>
--- a/twidere/src/main/res-localized/values-it/strings.xml
+++ b/twidere/src/main/res-localized/values-it/strings.xml
@ -678,12 +678,8 @@
  <string name="getting_location">Ottiene la posizione</string>
  <string name="save_to_gallery">Salva nella galleria</string>
  <string name="usage_statistics">Statistiche di utilizzo</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">Posizione sconosciuta</string>
  <string name="ellipsis">&#8230;</string>
-  <string name="designed_by">Creato da</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">Importa/Esporta le impostazioni</string>
  <string name="usage_statistics_header_summary">Twidere prende parte ad alcuni progetti di ricerca,unendoti a questi progetti renderai migliore Twidere e le altre applicationi.</string>
  <string name="no_tab">Nessuna scheda</string>
--- a/twidere/src/main/res-localized/values-ja/strings.xml
+++ b/twidere/src/main/res-localized/values-ja/strings.xml
@ -676,12 +676,8 @@
  <string name="getting_location">位置を取得しています。</string>
  <string name="save_to_gallery">ギャラリーに保存</string>
  <string name="usage_statistics">匿名利用状況データ</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">場所不明</string>
  <string name="ellipsis">&#8230;</string>
-  <string name="designed_by">作成者：</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">設定の保存/読み込み</string>
  <string name="usage_statistics_header_summary">ツイデレは研究プロジェクトに参加された事が有ります。貴方はプロジェクトに参加する事で、ツイデレや他将来のアプリケーションはより良く成ります。</string>
  <string name="no_tab">タブがありません</string>
--- a/twidere/src/main/res-localized/values-ko/strings.xml
+++ b/twidere/src/main/res-localized/values-ko/strings.xml
@ -685,12 +685,8 @@
  <string name="getting_location">위치 찾는 중</string>
  <string name="save_to_gallery">갤러리에 저장</string>
  <string name="usage_statistics">사용 통계</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">알 수 없는 위치</string>
  <string name="ellipsis">&#8230;</string>
-  <string name="designed_by">다음에 의해 디자인됨:</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">설정 가져오기/내보내기</string>
  <string name="usage_statistics_header_summary">Twidere는 일부 연구 프로젝트에 참여하고 있습니다. 프로젝트에 참여하면 Twidere와 다른 앱들을 향상시킬 수 있을 것입니다.</string>
  <string name="no_tab">탭 없음</string>
--- a/twidere/src/main/res-localized/values-lol/strings.xml
+++ b/twidere/src/main/res-localized/values-lol/strings.xml
@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="compose">KAMPOZ</string>
-  <string name="add_account">ADD AKOUNT</string>
-  <string name="settings">SETINGS</string>
-  <string name="send">发送</string>
-  <string name="add_location">添加地理位置</string>
-  <string name="add_image">添加图像</string>
-  <string name="take_photo">拍照</string>
-  <string name="remove_location">移除地理位置</string>
-  <string name="remove_image">移除图片</string>
-  <string name="remove_photo">移除照片</string>
-  <string name="status_hint">发生了什么？</string>
-  <string name="sign_up">注册</string>
-  <string name="sign_in">登录</string>
-  <string name="rest_base_url">REST Base URL</string>
-  <string name="oauth_base_url">OAuth Base URL</string>
-  <string name="signing_oauth_base_url">登录 OAuth Base URL</string>
-  <string name="signing_rest_base_url">登录 REST Base URL</string>
-  <string name="api_url_format">API URL 格式</string>
-  <string name="same_oauth_signing_url">使用相同的 URL 登录 OAuth</string>
-  <string name="auth_type">Auth 类型</string>
-  <string name="oauth">OAuth</string>
-  <string name="xauth">xAuth</string>
-  <string name="basic">Basic</string>
-  <string name="twip_o">Twip O Mode</string>
-  <string name="advanced">高级</string>
-  <string name="save">保存</string>
-  <string name="edit">编辑</string>
-  <string name="edit_api">编辑 API</string>
-  <string name="home">主页</string>
-  <string name="mentions">提及</string>
-  <string name="error_occurred">发生了一个错误，请再试一次。</string>
-  <string name="error_already_logged_in">您已经登录了。</string>
-  <string name="no_account_selected">没有选择账号。</string>
-  <string name="error_unknown_error">错误：未知错误，这可能是一个 BUG 。</string>
-  <string name="error_message">错误：<xliff:g id="message">%s</xliff:g></string>
-  <string name="error_message_with_action">错误在 <xliff:g id="action">%1$s</xliff:g>：<xliff:g id="message">%2$s</xliff:g></string>
-  <string name="error_message_rate_limit">请求 Twitter 频率超限，请重试 <xliff:g id="time">%s</xliff:g></string>
-  <string name="name_and_count_retweeted"><xliff:g id="user_name">%1$s</xliff:g> 和 <xliff:g id="retweet_count">%2$d</xliff:g> 等已转推</string>
-  <string name="N_retweeted_quantity_one" tools:ignore="PluralsCandidate"><xliff:g id="retweet_count">%d</xliff:g> 转推</string>
-  <string name="N_retweeted_quantity_other" tools:ignore="PluralsCandidate"><xliff:g id="retweet_count">%d</xliff:g> 转推</string>
-  <string name="retweeted_by_name">已由 <xliff:g id="user_name">%s</xliff:g> 转推</string>
-  <string name="retweeted_by_name_with_count">已由 <xliff:g id="user_name">%1$s</xliff:g> 和 <xliff:g id="retweet_count">%2$d</xliff:g> 等转推</string>
-  <string name="retweeted_by_count">由 <xliff:g id="retweet_count">%d</xliff:g> 用户转推</string>
-</resources>
--- a/twidere/src/main/res-localized/values-lol/strings_http_errors.xml
+++ b/twidere/src/main/res-localized/values-lol/strings_http_errors.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<resources>
-  <string name="error_http_407">需要代理认证</string>
-</resources>
--- a/twidere/src/main/res-localized/values-lol/strings_twitter_errors.xml
+++ b/twidere/src/main/res-localized/values-lol/strings_twitter_errors.xml
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<resources>
-  <string name="error_twitter_32">无法认证您，您可能需要尝试重新登录。</string>
-  <string name="error_twitter_34">这条推文、用户或页面不存在。</string>
-  <string name="error_twitter_88">超出频率限制，请稍候重试。</string>
-  <string name="error_twitter_89">您的登录信息出现错误或已过期，请重新登录。</string>
-  <string name="error_twitter_64">您的账号已经被冻结，并且不被允许访问这个功能。</string>
-  <string name="error_twitter_130">Twitter 暂时过载了。</string>
-  <string name="error_twitter_131">Twitter 服务器暂时宕机了，请稍后重试。</string>
-  <string name="error_twitter_135">请检查您的系统时钟。</string>
-  <string name="error_twitter_161">您已将关注请求发送给该用户。</string>
-  <string name="error_twitter_162">已经已经被该用户屏蔽。</string>
-  <string name="error_twitter_172">您已经保存了此次搜索。</string>
-  <string name="error_twitter_179">您无法查看受保护的用户推文。</string>
-  <string name="error_twitter_187">这条推文您已经发送过了。</string>
-  <string name="error_twitter_193">上传的照片太大了。</string>
-  <string name="error_twitter_215">您可能需要尝试再次登录。</string>
-</resources>
--- a/twidere/src/main/res-localized/values-pt/strings.xml
+++ b/twidere/src/main/res-localized/values-pt/strings.xml
@ -674,12 +674,8 @@
  <string name="getting_location">Recebendo localização</string>
  <string name="save_to_gallery">Guardado na galeria</string>
  <string name="usage_statistics">Estatísticas de uso</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">Localização desconhecida</string>
  <string name="ellipsis">&#8230;</string>
-  <string name="designed_by">Designed por</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">Importar/Exportar configurações</string>
  <string name="no_tab">Sem separador</string>
  <string name="user_protected_summary">Necessitas de seguir esta conta privada para ver os tweets</string>
--- a/twidere/src/main/res-localized/values-ru/strings.xml
+++ b/twidere/src/main/res-localized/values-ru/strings.xml
@ -680,12 +680,8 @@
  <string name="getting_location">Определение местонахождения</string>
  <string name="save_to_gallery">Сохранить в галерею</string>
  <string name="usage_statistics">Статистика использования</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">Неизвестное местоположение</string>
  <string name="ellipsis">...</string>
-  <string name="designed_by">Дизайнер</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">Импорт/Экспорт настроек</string>
  <string name="usage_statistics_header_summary">Twidere принимает участие в некоторых исследовательских проектах, присоединившись к которым вы сделаете Twidere и другие приложения лучше.</string>
  <string name="no_tab">Нет вкладок</string>
--- a/twidere/src/main/res-localized/values-uk/strings.xml
+++ b/twidere/src/main/res-localized/values-uk/strings.xml
@ -679,12 +679,8 @@
  <string name="getting_location">Визначення місцеположення</string>
  <string name="save_to_gallery">Зберегти в галерею</string>
  <string name="usage_statistics">Статистика  використання</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">Невідоме місцеположення</string>
  <string name="ellipsis">&#8230;</string>
-  <string name="designed_by">Дизайнер</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">Імпорт/Експорт налаштувань</string>
  <string name="usage_statistics_header_summary">Twidere приймає участь у деяких дослідницькому проєктах. Долучившись до них, ви покращете Twidere та деякі інші програми.</string>
  <string name="no_tab">Нема вкладок</string>
--- a/twidere/src/main/res-localized/values-zh-rCN/strings.xml
+++ b/twidere/src/main/res-localized/values-zh-rCN/strings.xml
@ -681,12 +681,8 @@
  <string name="getting_location">获取位置</string>
  <string name="save_to_gallery">保存到相册</string>
  <string name="usage_statistics">使用信息统计</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">未知位置</string>
  <string name="ellipsis">&#8230;</string>
-  <string name="designed_by">设计</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">导入/导出设定</string>
  <string name="usage_statistics_header_summary">Twidere参与了一些研究项目，加入这些项目帮助Twidere和更多应用做得更好。</string>
  <string name="no_tab">没有标签页</string>
--- a/twidere/src/main/res-localized/values-zh/strings.xml
+++ b/twidere/src/main/res-localized/values-zh/strings.xml
@ -679,12 +679,8 @@
  <string name="getting_location">獲取位置</string>
  <string name="save_to_gallery">儲存到相冊</string>
  <string name="usage_statistics">使用資訊統計</string>
-  <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-  <string name="research_tsinghua_spice">Tsinghua Spice</string>
  <string name="unknown_location">未知位置</string>
  <string name="ellipsis">&#8230;</string>
-  <string name="designed_by">設計</string>
-  <string name="designer_name">Uucky Lee</string>
  <string name="import_export_settings">導入/導出設定</string>
  <string name="usage_statistics_header_summary">Twidere參與了一些研究項目，加入這些項目幫助Twidere和更多應用做得更好。</string>
  <string name="no_tab">沒有標籤頁</string>
--- a/twidere/src/main/res/values/strings.xml
+++ b/twidere/src/main/res/values/strings.xml
@ -683,12 +683,9 @@
    <string name="getting_location">Getting location</string>
    <string name="save_to_gallery">Save to gallery</string>
    <string name="usage_statistics">Usage statistics</string>
-    <string name="research_ucdavis_earlybird">UCDavis Earlybird</string>
-    <string name="research_tsinghua_spice">Tsinghua Spice</string>
+    <string name="research_tsinghua_hot_mobile">Tsinghua HotMobile</string>
    <string name="unknown_location">Unknown location</string>
    <string name="ellipsis">…</string>
-    <string name="designed_by">Designed by</string>
-    <string name="designer_name">Uucky Lee</string>
    <string name="import_export_settings">Import/Export settings</string>
    <string name="usage_statistics_header_summary">Twidere took part in some research project, join these projects will make Twidere and some other application better.</string>
    <string name="no_tab">No tab</string>
--- a/twidere/src/main/res/xml/preferences_usage_statistics.xml
+++ b/twidere/src/main/res/xml/preferences_usage_statistics.xml
@ -30,11 +30,9 @@
    <PreferenceCategory
        android:title="@string/projects_we_took_part"
        android:order="12">
-        <Preference
-            android:title="@string/research_ucdavis_earlybird"/>

        <Preference
-            android:title="@string/research_tsinghua_spice"/>
+            android:title="@string/research_tsinghua_hot_mobile"/>
    </PreferenceCategory>

 </PreferenceScreen>
--- a/twidere/src/main/res/xml/settings_wizard_page_usage_statistics.xml
+++ b/twidere/src/main/res/xml/settings_wizard_page_usage_statistics.xml
@ -24,6 +24,6 @@

    <org.mariotaku.twidere.preference.ForegroundColorIconPreference
        android:order="11"
-        android:title="@string/research_tsinghua_spice"/>
+        android:title="@string/research_tsinghua_hot_mobile"/>

 </PreferenceScreen>