mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2024-12-22 16:50:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request 'fix-lock' (#959) from s1m/Fedilab:fix-lock into develop

Browse source 
Reviewed-on: https://codeberg.org/tom79/Fedilab/pulls/959
This commit is contained in:
Thomas 2023-09-09 13:36:12 +00:00
commit 63e444ffb5
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/app/fedilab/android/mastodon/helper/NotificationsHelper.java
View file

@ -41,6 +41,7 @@ import java.net.IDN;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import app.fedilab.android.BaseMainActivity;
@ -105,9 +106,9 @@ public class NotificationsHelper {
new Thread(() -> {
ReentrantLock lock = getLock(slug);
try {
// fetch if we get the lock, or ignore, another thread is doing the job
if (lock.tryLock()) {
// fetch if we get the lock, or ignore, another thread is doing the job
if (lock.tryLock()) {
try {
MastodonNotificationsService mastodonNotificationsService = init(context, slugArray[1]);
Notifications notifications = new Notifications();
Call<List<Notification>> notificationsCall;
@ -135,10 +136,11 @@ public class NotificationsHelper {
Runnable myRunnable = () -> onRetrieveNotifications(context, notifications, accountDb, last_notif_id);
mainHandler.post(myRunnable);
}
}
} finally {
if (lock.isHeldByCurrentThread()) {
lock.unlock();
} finally {
if (lock.isHeldByCurrentThread()) {
lock.unlock();
}
}
}
}).start();
@ -147,7 +149,11 @@ public class NotificationsHelper {
private static MastodonNotificationsService init(Context context, String instance) {
final OkHttpClient okHttpClient = Helper.myOkHttpClient(context);
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://" + (instance != null ? IDN.toASCII(instance, IDN.ALLOW_UNASSIGNED) : null) + "/api/v1/")
.addConverterFactory(GsonConverterFactory.create(Helper.getDateBuilder()))