diff options
| author | Thomas <tschneider.ac@gmail.com> | 2023-08-23 09:35:35 +0200 |
|---|---|---|
| committer | Thomas <tschneider.ac@gmail.com> | 2023-08-23 09:35:35 +0200 |
| commit | 14bd5e9750af3ed92983d3fc6372139666856d26 (patch) | |
| tree | 6e0cad0ae99fd3c4c4bf090f5ecf170ac391be5e | |
| parent | 50e88b3f86fad0658c2b8791b6b84abc087b0759 (diff) | |
Fix a crash when instance is null
| -rw-r--r-- | app/src/main/java/app/fedilab/android/BaseMainActivity.java | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/fedilab/android/mastodon/helper/TimelineHelper.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java index 398a62b32..8009a1043 100644 --- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java @@ -1114,7 +1114,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt .proxy(Helper.getProxy(getApplication().getApplicationContext())) .build(); Retrofit retrofit = new Retrofit.Builder() - .baseUrl("https://" + IDN.toASCII(MainActivity.currentInstance, IDN.ALLOW_UNASSIGNED) + "/api/v1/") + .baseUrl("https://" + (MainActivity.currentInstance != null ? IDN.toASCII(MainActivity.currentInstance, IDN.ALLOW_UNASSIGNED) : null) + "/api/v1/") .addConverterFactory(GsonConverterFactory.create(Helper.getDateBuilder())) .client(okHttpClient) .build(); 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 ce335726b..8f110772b 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 @@ -62,7 +62,7 @@ public class TimelineHelper { .proxy(Helper.getProxy(context)) .build(); Retrofit retrofit = new Retrofit.Builder() - .baseUrl("https://" + IDN.toASCII(BaseMainActivity.currentInstance, IDN.ALLOW_UNASSIGNED) + "/api/v2/") + .baseUrl("https://" + (MainActivity.currentInstance != null ? IDN.toASCII(MainActivity.currentInstance, IDN.ALLOW_UNASSIGNED) : null) + "/api/v2/") .addConverterFactory(GsonConverterFactory.create()) .client(okHttpClient) .build(); |