mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-03 05:34:51 +00:00
Code Issues Releases Wiki Activity

Fixed live data invalidation

Browse source
This commit is contained in:
M66B 2020-05-11 20:07:26 +02:00
parent cfb0450e30
commit a5dc47c82d
2 changed files with 41 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/androidx/room/RoomTrackingLiveData.java
View file

@ -84,11 +84,14 @@ class RoomTrackingLiveData<T> extends LiveData<T> {
// as long as it is invalid, keep computing.
try {
T value = null;
while (mInvalid.compareAndSet(true, false)) {
computed = true;
int retry = 0;
while (mInvalid.compareAndSet(true, false) && !computed) {
boolean done = false;
while (!done) {
try {
value = mComputeFunction.call();
computed = true;
done = true;
} catch (Exception e) {
if (++retry > 10)
throw new RuntimeException(
@ -100,6 +103,7 @@ class RoomTrackingLiveData<T> extends LiveData<T> {
}
}
}
}
if (computed) {
postValue(value);
}

35
patches/room.patch
View file

@ -1,31 +1,36 @@
--- /home/marcel/support/room/runtime/src/main/java/androidx/room/RoomTrackingLiveData.java 2019-07-27 12:47:44.950985792 +0200
+++ app/src/main/java/androidx/room/RoomTrackingLiveData.java 2019-08-01 09:33:53.297685740 +0200
@@ -84,13 +84,20 @@ class RoomTrackingLiveData<T> extends Li
// as long as it is invalid, keep computing.
try {
diff --git a/home/marcel/tmp/RoomTrackingLiveData.java b/app/src/main/java/androidx/room/RoomTrackingLiveData.java
index 8df1014a4..875beba9b 100644
--- a/home/marcel/tmp/RoomTrackingLiveData.java
+++ b/app/src/main/java/androidx/room/RoomTrackingLiveData.java
@@ -86,11 +86,22 @@ class RoomTrackingLiveData<T> extends LiveData<T> {
T value = null;
- while (mInvalid.compareAndSet(true, false)) {
- computed = true;
+ int retry = 0;
+ while (mInvalid.compareAndSet(true, false) && !computed) {
try {
value = mComputeFunction.call();
+ computed = true;
} catch (Exception e) {
while (mInvalid.compareAndSet(true, false)) {
computed = true;
- try {
- value = mComputeFunction.call();
- } catch (Exception e) {
- throw new RuntimeException("Exception while computing database"
- + " live data.", e);
+ if (++retry > 3)
+ int retry = 0;
+ boolean done = false;
+ while (!done) {
+ try {
+ value = mComputeFunction.call();
+ done = true;
+ } catch (Exception e) {
+ if (++retry > 10)
+ throw new RuntimeException(
+ "Exception while computing database live data.", e);
+ eu.faircode.email.Log.w(e);
+ try {
+ Thread.sleep(3000L);
+ } catch (InterruptedException ignored) {
+ }
+ }
}
}
if (computed) {
@@ -125,6 +132,7 @@ class RoomTrackingLiveData<T> extends Li
@@ -125,6 +136,7 @@ class RoomTrackingLiveData<T> extends LiveData<T> {
}
}
};