Commit bbb47626 authored by Thomas's avatar Thomas
Browse files

fix for all calls

parent ac290dec

app/src/main/java/app/fedilab/android/mastodon/client/entities/nitter/Nitter.java

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public class Nitter implements Serializable { 
                .proxy(Helper.getProxy(context))

                .build();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED))

                .baseUrl("https://" + (instance != null ? IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) : null))

                .addConverterFactory(SimpleXmlConverterFactory.create())

                .client(okHttpClient)

                .build();

app/src/main/java/app/fedilab/android/mastodon/helper/CrossActionHelper.java

+3 −5
Original line number Diff line number Diff line
@@ -259,14 +259,14 @@ public class CrossActionHelper { 
    }





    private static MastodonSearchService init(Context context, @NonNull String instance) {

    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();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) + "/api/v2/")

                .baseUrl("https://" + (instance != null ? IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) : null) + "/api/v2/")

                .addConverterFactory(GsonConverterFactory.create(Helper.getDateBuilder()))

                .client(okHttpClient)

                .build();
@@ -493,9 +493,7 @@ public class CrossActionHelper { 
     * Fetch and federate the remote status

     */

    public static void fetchAccountInRemoteInstance(@NonNull Context context, String acct, String instance, Callback callback) {

        if (instance == null) {

            return;

        }



        MastodonSearchService mastodonSearchService = init(context, instance);

        new Thread(() -> {

            Call<Results> resultsCall = mastodonSearchService.search(null, acct, null, "accounts", null, null, null, null, null, null, 1);

app/src/main/java/app/fedilab/android/mastodon/helper/NotificationsHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public class NotificationsHelper { 
    }





    private static MastodonNotificationsService init(Context context, @NonNull String instance) {

    private static MastodonNotificationsService init(Context context, String instance) {



        final OkHttpClient okHttpClient = new OkHttpClient.Builder()

                .readTimeout(60, TimeUnit.SECONDS)
@@ -143,7 +143,7 @@ public class NotificationsHelper { 
                .proxy(Helper.getProxy(context))

                .build();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) + "/api/v1/")

                .baseUrl("https://" + (instance != null ? IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) : null) + "/api/v1/")

                .addConverterFactory(GsonConverterFactory.create(Helper.getDateBuilder()))

                .client(okHttpClient)

                .build();

app/src/main/java/app/fedilab/android/mastodon/helper/PushNotifications.java

+2 −2
Original line number Diff line number Diff line
@@ -131,14 +131,14 @@ public class PushNotifications { 
                slug + "/unifiedpush.connector", null);

    }



    private static MastodonNotificationsService init(@NonNull Context context, @NonNull String instance) {

    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();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) + "/api/v1/")

                .baseUrl("https://" + (instance != null ? IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) : null) + "/api/v1/")

                .addConverterFactory(GsonConverterFactory.create(Helper.getDateBuilder()))

                .client(okHttpClient)

                .build();

app/src/main/java/app/fedilab/android/mastodon/jobs/ComposeWorker.java

+2 −2
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ public class ComposeWorker extends Worker { 
                .build();

    }



    private static MastodonStatusesService init(Context context, @NonNull String instance) {

    private static MastodonStatusesService init(Context context, String instance) {

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) + "/api/v1/")

                .baseUrl("https://" + (instance != null ? IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) : null) + "/api/v1/")

                .addConverterFactory(GsonConverterFactory.create(Helper.getDateBuilder()))

                .client(getOkHttpClient(context))

                .build();