TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add additional safeguards for picking an expiration timer frame.

Browse Source 
Fixes #8010
This commit is contained in:
Greyson Parrelli 2018-07-20 14:08:58 -07:00
parent d303a88803
commit d0eaee60e9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/components/ExpirationTimerView.java
View File

@ -54,6 +54,8 @@ public class ExpirationTimerView extends android.support.v7.widget.AppCompatImag
public void setPercentComplete(float percentage) { public void setPercentComplete(float percentage) {
float percentFull = 1 - percentage; float percentFull = 1 - percentage;
int frame = (int) Math.ceil(percentFull * (frames.length - 1)); int frame = (int) Math.ceil(percentFull * (frames.length - 1));
frame = Math.max(0, Math.min(frame, frames.length - 1));
setImageResource(frames[frame]); setImageResource(frames[frame]);
} }
@ -77,7 +79,7 @@ public class ExpirationTimerView extends android.support.v7.widget.AppCompatImag
long progressed = System.currentTimeMillis() - startedAt; long progressed = System.currentTimeMillis() - startedAt;
float percentComplete = (float)progressed / (float)expiresIn; float percentComplete = (float)progressed / (float)expiresIn;
return Math.min(percentComplete, 1); return Math.max(0, Math.min(percentComplete, 1));
} }
private long calculateAnimationDelay(long startedAt, long expiresIn) { private long calculateAnimationDelay(long startedAt, long expiresIn) {