luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-05 04:40:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #504 from alexbakker/fix-zero-div

Browse source 
Fix division by zero when calculating progress for large periods
This commit is contained in:
Michael Schättgen 2020-07-04 12:19:31 +02:00 • committed by GitHub
commit 4ef8d9e826
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/beemdevelopment/aegis/ui/views/TotpProgressBar.java
View file

@ -65,8 +65,8 @@ public class TotpProgressBar extends ProgressBar {
int currentProgress = (int) (maxProgress * ((float) millisTillRotation / (_period * 1000))); int currentProgress = (int) (maxProgress * ((float) millisTillRotation / (_period * 1000)));
// start progress animation, compensating for any changes to the animator duration scale settings // start progress animation, compensating for any changes to the animator duration scale settings
int animPart = maxProgress / _period; float animPart = (float) maxProgress / _period;
int animEnd = (currentProgress / animPart) * animPart; int animEnd = (int) ((currentProgress / animPart) * animPart);
int animPartDuration = (int) (1000 / _animDurationScale); int animPartDuration = (int) (1000 / _animDurationScale);
float animDurationFraction = (float) (currentProgress - animEnd) / animPart; float animDurationFraction = (float) (currentProgress - animEnd) / animPart;
int realAnimDuration = (int) (1000 * animDurationFraction); int realAnimDuration = (int) (1000 * animDurationFraction);

2
app/src/main/res/layout/card_entry_compact.xml
View file

@ -148,7 +148,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="3dp" android:layout_height="3dp"
android:id="@+id/progressBar" android:id="@+id/progressBar"
android:max="1000" android:max="5000"
android:layout_weight="1"/> android:layout_weight="1"/>
</LinearLayout> </LinearLayout>

2
app/src/main/res/layout/card_entry_small.xml
View file

@ -145,7 +145,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="3dp" android:layout_height="3dp"
android:id="@+id/progressBar" android:id="@+id/progressBar"
android:max="1000" android:max="5000"
android:layout_weight="1"/> android:layout_weight="1"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>