Commit 44752cc3 authored by Thomas's avatar Thomas
Browse files

Fix Punycode not supported for domains

parent 28501e79

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

+2 −1
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ import org.jsoup.nodes.Element; 
import java.io.File;

import java.io.IOException;

import java.lang.ref.WeakReference;

import java.net.IDN;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;
@@ -1113,7 +1114,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                        .proxy(Helper.getProxy(getApplication().getApplicationContext()))

                        .build();

                Retrofit retrofit = new Retrofit.Builder()

                        .baseUrl("https://" + MainActivity.currentInstance + "/api/v1/")

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

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

                        .client(okHttpClient)

                        .build();

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

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import org.simpleframework.xml.Path; 
import org.simpleframework.xml.Root;



import java.io.Serializable;

import java.net.IDN;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;
@@ -68,7 +69,7 @@ public class Nitter implements Serializable { 
                .proxy(Helper.getProxy(context))

                .build();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + instance)

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

                .addConverterFactory(SimpleXmlConverterFactory.create())

                .client(okHttpClient)

                .build();

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

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.preference.PreferenceManager; 
import com.google.android.material.dialog.MaterialAlertDialogBuilder;



import java.io.IOException;

import java.net.IDN;

import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.TimeUnit;
@@ -265,7 +266,7 @@ public class CrossActionHelper { 
                .proxy(Helper.getProxy(context))

                .build();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + instance + "/api/v2/")

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

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

                .client(okHttpClient)

                .build();

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

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.bumptech.glide.Glide; 
import com.bumptech.glide.request.target.CustomTarget;

import com.bumptech.glide.request.transition.Transition;



import java.net.IDN;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;
@@ -142,7 +143,7 @@ public class NotificationsHelper { 
                .proxy(Helper.getProxy(context))

                .build();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + instance + "/api/v1/")

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

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

                .client(okHttpClient)

                .build();

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

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.os.Looper; 
import androidx.annotation.NonNull;

import androidx.preference.PreferenceManager;



import java.net.IDN;

import java.util.concurrent.TimeUnit;



import app.fedilab.android.R;
@@ -137,7 +138,7 @@ public class PushNotifications { 
                .proxy(Helper.getProxy(context.getApplicationContext()))

                .build();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + instance + "/api/v1/")

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

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

                .client(okHttpClient)

                .build();