Commit b8c96e87 authored by Thomas's avatar Thomas
Browse files

Add custom user agent

parent 52049746

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+1 −6
Original line number Diff line number Diff line
@@ -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()))

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

+1 −7
Original line number Diff line number Diff line
@@ -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())

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

+1 −6
Original line number Diff line number Diff line
@@ -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()))

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

+19 −0
Original line number Diff line number Diff line
@@ -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();

    }

}

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

+1 −6
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import java.net.IDN; 
import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.concurrent.TimeUnit;



import app.fedilab.android.BaseMainActivity;

import app.fedilab.android.R;
@@ -137,11 +136,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()))