diff options
31 files changed, 74 insertions, 185 deletions
diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java index 0798dbd65..06f7cbe31 100644 --- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java @@ -1107,12 +1107,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt } //If the attached account is null, the app will fetch remote instance to get up-to-date values if (currentAccount != null && currentAccount.mastodon_account == null) { - OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .callTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(getApplication().getApplicationContext())) - .build(); + OkHttpClient okHttpClient = Helper.myOkHttpClient(getApplication().getApplicationContext()); Retrofit retrofit = new Retrofit.Builder() .baseUrl("https://" + (MainActivity.currentInstance != null ? IDN.toASCII(MainActivity.currentInstance, IDN.ALLOW_UNASSIGNED) : null) + "/api/v1/") .addConverterFactory(GsonConverterFactory.create(Helper.getDateBuilder())) diff --git a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Poll.java b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Poll.java index e9270f062..87269a59a 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Poll.java +++ b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Poll.java @@ -61,7 +61,7 @@ public class Poll implements Serializable { public transient Spannable span_title; public Spannable getSpanTitle(Context context, Status status, WeakReference<View> viewWeakReference) { - span_title = SpannableHelper.convert(context, title, status, null, null, viewWeakReference, null, false); + span_title = SpannableHelper.convert(context, title, status, null, null, viewWeakReference, null, false, false); return span_title; } } diff --git a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java index 15fec66bb..062ee42c2 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java +++ b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java @@ -152,21 +152,21 @@ public class Status implements Serializable, Cloneable { public synchronized Spannable getSpanContent(Context context, WeakReference<View> viewWeakReference, Callback callback) { if (contentSpan == null) { - contentSpan = SpannableHelper.convert(context, content, this, null, null, viewWeakReference, callback); + contentSpan = SpannableHelper.convert(context, content, this, null, null, viewWeakReference, callback, true); } return contentSpan; } public synchronized Spannable getSpanSpoiler(Context context, WeakReference<View> viewWeakReference, Callback callback) { if (contentSpoilerSpan == null) { - contentSpoilerSpan = SpannableHelper.convert(context, spoiler_text, this, null, null, viewWeakReference, callback); + contentSpoilerSpan = SpannableHelper.convert(context, spoiler_text, this, null, null, viewWeakReference, callback, false); } return contentSpoilerSpan; } public synchronized Spannable getSpanTranslate(Context context, WeakReference<View> viewWeakReference, Callback callback) { if (contentTranslateSpan == null) { - contentTranslateSpan = SpannableHelper.convert(context, translationContent, this, null, null, viewWeakReference, callback); + contentTranslateSpan = SpannableHelper.convert(context, translationContent, this, null, null, viewWeakReference, callback, true); } return contentTranslateSpan; } diff --git a/app/src/main/java/app/fedilab/android/mastodon/client/entities/nitter/Nitter.java b/app/src/main/java/app/fedilab/android/mastodon/client/entities/nitter/Nitter.java index a3465ef11..015e0c7f2 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/client/entities/nitter/Nitter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/client/entities/nitter/Nitter.java @@ -29,7 +29,6 @@ import java.net.IDN; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -62,12 +61,7 @@ public class Nitter implements Serializable { public static MastodonTimelinesService initInstanceXMLOnly(Context context, String instance) { - OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .callTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(context)) - .build(); + OkHttpClient okHttpClient = Helper.myOkHttpClient(context); Retrofit retrofit = new Retrofit.Builder() .baseUrl("https://" + (instance != null ? IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) : null)) .addConverterFactory(SimpleXmlConverterFactory.create()) diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/CrossActionHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/CrossActionHelper.java index 8196b1973..49b525c4c 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/CrossActionHelper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/CrossActionHelper.java @@ -34,7 +34,6 @@ import java.io.IOException; import java.net.IDN; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; import app.fedilab.android.BaseMainActivity; import app.fedilab.android.R; @@ -260,11 +259,7 @@ public class CrossActionHelper { private static MastodonSearchService init(Context context, String instance) { - final OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(context)) - .build(); + final OkHttpClient okHttpClient = Helper.myOkHttpClient(context); Retrofit retrofit = new Retrofit.Builder() .baseUrl("https://" + (instance != null ? IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) : null) + "/api/v2/") .addConverterFactory(GsonConverterFactory.create(Helper.getDateBuilder())) diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java index e754f0336..04a07d1eb 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java @@ -140,6 +140,7 @@ import java.util.Random; import java.util.Set; import java.util.TimeZone; import java.util.UUID; +import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -168,6 +169,8 @@ import app.fedilab.android.mastodon.watermark.androidwm.bean.WatermarkText; import es.dmoral.toasty.Toasty; import okhttp3.MediaType; import okhttp3.MultipartBody; +import okhttp3.OkHttpClient; +import okhttp3.Request; import okhttp3.RequestBody; public class Helper { @@ -2080,4 +2083,20 @@ public class Helper { return false; } } + + public static OkHttpClient myOkHttpClient(Context context) { + return new OkHttpClient.Builder() + .addInterceptor(chain -> { + Request originalRequest = chain.request(); + Request requestWithUserAgent = originalRequest.newBuilder() + .header("User-Agent", context.getString(R.string.app_name) + "/" + BuildConfig.VERSION_NAME + "/" + BuildConfig.VERSION_CODE) + .build(); + return chain.proceed(requestWithUserAgent); + }) + .readTimeout(60, TimeUnit.SECONDS) + .connectTimeout(60, TimeUnit.SECONDS) + .callTimeout(60, TimeUnit.SECONDS) + .proxy(Helper.getProxy(context)) + .build(); + } } diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/NotificationsHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/NotificationsHelper.java index e09dee4eb..6759a45a1 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/NotificationsHelper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/NotificationsHelper.java @@ -134,11 +134,7 @@ public class NotificationsHelper { private static MastodonNotificationsService init(Context context, String instance) { - final OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(context)) - .build(); + final OkHttpClient okHttpClient = Helper.myOkHttpClient(context); Retrofit retrofit = new Retrofit.Builder() .baseUrl("https://" + (instance != null ? IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) : null) + "/api/v1/") .addConverterFactory(GsonConverterFactory.create(Helper.getDateBuilder())) diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/PushNotifications.java b/app/src/main/java/app/fedilab/android/mastodon/helper/PushNotifications.java index 1f997a40d..564b0e4d0 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/PushNotifications.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/PushNotifications.java @@ -24,7 +24,6 @@ import androidx.annotation.NonNull; import androidx.preference.PreferenceManager; import java.net.IDN; -import java.util.concurrent.TimeUnit; import app.fedilab.android.R; import app.fedilab.android.mastodon.client.endpoints.MastodonNotificationsService; @@ -132,11 +131,7 @@ public class PushNotifications { } private static MastodonNotificationsService init(@NonNull Context context, String instance) { - final OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(context.getApplicationContext())) - .build(); + final OkHttpClient okHttpClient = Helper.myOkHttpClient(context); Retrofit retrofit = new Retrofit.Builder() .baseUrl("https://" + (instance != null ? IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) : null) + "/api/v1/") .addConverterFactory(GsonConverterFactory.create(Helper.getDateBuilder())) diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java index 4cbfa8c83..d6c4ee815 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java @@ -108,13 +108,13 @@ public class SpannableHelper { public static Spannable convert(Context context, String text, Status status, Account account, Announcement announcement, WeakReference<View> viewWeakReference) { - return convert(context, text, status, account, announcement, viewWeakReference, null, true); + return convert(context, text, status, account, announcement, viewWeakReference, null, true, false); } public static Spannable convert(Context context, String text, Status status, Account account, Announcement announcement, - WeakReference<View> viewWeakReference, Status.Callback callback) { - return convert(context, text, status, account, announcement, viewWeakReference, callback, true); + WeakReference<View> viewWeakReference, Status.Callback callback, boolean convertMarkdown) { + return convert(context, text, status, account, announcement, viewWeakReference, callback, true, convertMarkdown); } @@ -135,7 +135,7 @@ public class SpannableHelper { public static Spannable convert(Context context, String text, Status status, Account account, Announcement announcement, - WeakReference<View> viewWeakReference, Status.Callback callback, boolean convertHtml) { + WeakReference<View> viewWeakReference, Status.Callback callback, boolean convertHtml, boolean convertMarkdown) { if (text == null) { return null; } @@ -179,7 +179,7 @@ public class SpannableHelper { boolean markdownSupport = sharedpreferences.getBoolean(context.getString(R.string.SET_MARKDOWN_SUPPORT), true); //Get all links SpannableStringBuilder content; - if (markdownSupport) { + if (markdownSupport && convertMarkdown) { MarkdownConverter markdownConverter = new MarkdownConverter(); markdownConverter.markdownItems = new ArrayList<>(); int next; diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/TimelineHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/TimelineHelper.java index 8f110772b..53d99f18b 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/TimelineHelper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/TimelineHelper.java @@ -33,7 +33,6 @@ import java.net.IDN; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -56,11 +55,7 @@ import retrofit2.converter.gson.GsonConverterFactory; public class TimelineHelper { private static MastodonFiltersService initv2(Context context) { - OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(context)) - .build(); + OkHttpClient okHttpClient = Helper.myOkHttpClient(context); Retrofit retrofit = new Retrofit.Builder() .baseUrl("https://" + (MainActivity.currentInstance != null ? IDN.toASCII(MainActivity.currentInstance, IDN.ALLOW_UNASSIGNED) : null) + "/api/v2/") .addConverterFactory(GsonConverterFactory.create()) diff --git a/app/src/main/java/app/fedilab/android/mastodon/jobs/FetchHomeWorker.java b/app/src/main/java/app/fedilab/android/mastodon/jobs/FetchHomeWorker.java index dae01c5b0..2848421b7 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/jobs/FetchHomeWorker.java +++ b/app/src/main/java/app/fedilab/android/mastodon/jobs/FetchHomeWorker.java @@ -64,12 +64,7 @@ public class FetchHomeWorker extends Worker { private static final int FETCH_HOME_CHANNEL_ID = 5; private static final String CHANNEL_ID = "fedilab_home"; - final OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .callTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(getApplicationContext().getApplicationContext())) - .build(); + final OkHttpClient okHttpClient = Helper.myOkHttpClient(getApplicationContext()); private final NotificationManager notificationManager; diff --git a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AccountsVM.java b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AccountsVM.java index 7deb0e739..91a1856fc 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AccountsVM.java +++ b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AccountsVM.java @@ -27,7 +27,6 @@ import androidx.lifecycle.MutableLiveData; import java.net.IDN; import java.util.LinkedHashMap; import java.util.List; -import java.util.concurrent.TimeUnit; import app.fedilab.android.R; import app.fedilab.android.activities.MainActivity; @@ -69,12 +68,7 @@ import retrofit2.converter.gson.GsonConverterFactory; public class AccountsVM extends AndroidViewModel { - final OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .callTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(getApplication().getApplicationContext())) - .build(); + final OkHttpClient okHttpClient = Helper.myOkHttpClient(getApplication().getApplicationContext()); private MutableLiveData<Account> accountMutableLiveData; diff --git a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AdminVM.java b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AdminVM.java index c3a08155c..514a43abf 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AdminVM.java +++ b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AdminVM.java @@ -25,7 +25,6 @@ import androidx.lifecycle.MutableLiveData; import java.net.IDN; import java.util.List; -import java.util.concurrent.TimeUnit; import app.fedilab.android.mastodon.client.endpoints.MastodonAdminService; import app.fedilab.android.mastodon.client.entities.api.admin.AdminAccount; @@ -44,12 +43,7 @@ import retrofit2.converter.gson.GsonConverterFactory; public class AdminVM extends AndroidViewModel { - final OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .callTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(getApplication().getApplicationContext())) - .build(); + final OkHttpClient okHttpClient = Helper.myOkHttpClient(getApplication().getApplicationContext()); private MutableLiveData<AdminAccount> adminAccountMutableLiveData; private MutableLiveData<AdminAccounts> adminAccountsListMutableLiveData; private MutableLiveData<AdminReport> adminReportMutableLiveData; diff --git a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AnnouncementsVM.java b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AnnouncementsVM.java index 235e44e6a..b168c0bb0 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AnnouncementsVM.java +++ b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AnnouncementsVM.java @@ -25,7 +25,6 @@ import androidx.lifecycle.MutableLiveData; import java.net.IDN; import java.util.List; -import java.util.concurrent.TimeUnit; import app.fedilab.android.mastodon.client.endpoints.MastodonAnnouncementsService; import app.fedilab.android.mastodon.client.entities.api.Announcement; @@ -38,12 +37,7 @@ import retrofit2.converter.gson.GsonConverterFactory; public class AnnouncementsVM extends AndroidViewModel { - final OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .callTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(getApplication().getApplicationContext())) - .build(); + final OkHttpClient okHttpClient = Helper.myOkHttpClient(getApplication().getApplicationContext()); private MutableLiveData<Announcement> announcementMutableLiveData; private MutableLiveData<List<Announcement>> announcementListMutableLiveData; diff --git a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AppsVM.java b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AppsVM.java index 3e472e7e7..7535058a1 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AppsVM.java +++ b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AppsVM.java @@ -27,7 +27,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.net.IDN; -import java.util.concurrent.TimeUnit; import app.fedilab.android.mastodon.client.endpoints.MastodonAppsService; import app.fedilab.android.mastodon.client.entities.api.App; @@ -40,12 +39,7 @@ import retrofit2.converter.gson.GsonConverterFactory; public class AppsVM extends AndroidViewModel { - final OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .callTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(getApplication().getApplicationContext())) - .build(); + final OkHttpClient okHttpClient = Helper.myOkHttpClient(getApplication().getApplicationContext()); private MutableLiveData<App> appMutableLiveData; diff --git a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/FiltersVM.java b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/FiltersVM.java index a063616f8..76a9fc076 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/FiltersVM.java +++ b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/FiltersVM.java @@ -26,7 +26,6 @@ import androidx.lifecycle.MutableLiveData; import java.net.IDN; import java.util.List; -import java.util.concurrent.TimeUnit; import app.fedilab.android.BaseMainActivity; import app.fedilab.android.mastodon.client.endpoints.MastodonFiltersService; @@ -41,12 +40,7 @@ import retrofit2.converter.gson.GsonConverterFactory; public class FiltersVM extends AndroidViewModel { - final OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .callTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(getApplication().getApplicationContext())) - .build(); + final OkHttpClient okHttpClient = Helper.myOkHttpClient(getApplication().getApplicationContext()); private MutableLiveData<Filter> filterMutableLiveData; diff --git a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/InstanceSocialVM.java b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/InstanceSocialVM.java index b4b5f9e07..c8ea85408 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/InstanceSocialVM.java +++ b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/InstanceSocialVM.java @@ -23,7 +23,6 @@ import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.MutableLiveData; import java.util.ArrayList; -import java.util.concurrent.TimeUnit; import app.fedilab.android.mastodon.client.entities.app.InstanceSocial; import app.fedilab.android.mastodon.helper.Helper; @@ -36,12 +35,7 @@ import retrofit2.converter.gson.GsonConverterFactory; public class InstanceSocialVM extends AndroidViewModel { - final OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .callTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(getApplication().getApplicationContext())) - .build(); + final OkHttpClient okHttpClient = Helper.myOkHttpClient(getApplication().getApplicationContext()); private final InstancesSocialService instancesSocialService; private MutableLiveData<InstanceSocial> instanceSocialMutableLiveData; diff --git a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/InstancesVM.java b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/InstancesVM.java index 643c0b807..55942875a 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/InstancesVM.java +++ b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/InstancesVM.java @@ -29,7 +29,6 @@ import com.google.gson.GsonBuilder; import java.net.IDN; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; import app.fedilab.android.BaseMainActivity; import app.fedilab.android.mastodon.client.endpoints.MastodonInstanceService; @@ -48,12 +47,7 @@ import retrofit2.converter.gson.GsonConverterFactory; public class InstancesVM extends AndroidViewModel { - final OkHttpClient okHttpClient = new OkHttpClient.Builder() - .readTimeout(60, TimeUnit.SECONDS) - .connectTimeout(60, TimeUnit.SECONDS) - .callTimeout(60, TimeUnit.SECONDS) - .proxy(Helper.getProxy(getApplication().getApplicationContext())) - .build(); + final OkHttpClient okHttpClient = Helper.myOkHttpClient(getApplication().getApplicationContext()); private MutableLiveData<EmojiInstance> emojiInstanceMutableLiveData; private MutableLiveData<InstanceInfo> instanceInfoMutableLiveData; diff --git a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/JoinInstancesVM.java b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/JoinInstancesVM.java index 2fd5c0ac1..0b261b33b 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/JoinInstancesVM.java |