bitPickups/bitPicksAktivpause
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a crash that would occur when having no set selected.

Browse source
This commit is contained in:
Christopher Beckmann 2018-09-05 12:39:47 +02:00
commit 4edaf88a33
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/main/ic_drawer_logo-web.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
app/src/main/ic_launcher-web.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 37 KiB

12
app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/TimerActivity.java
View file

@ -286,7 +286,10 @@ public class TimerActivity extends BaseActivity implements android.support.v4.ap
saveCurrentSetDuration();
ExerciseSet set = getCurrentSelectedExerciseSet();
long seconds = set.getExerciseSetTime(this);
long seconds = 0;
if(set != null) seconds = set.getExerciseSetTime(this);
if(seconds * 1000 > getCurrentSetBreakTime()) {
showTimeWarningDialog(new DialogInterface.OnClickListener() {
@ -331,7 +334,12 @@ public class TimerActivity extends BaseActivity implements android.support.v4.ap
.putInt(FirstLaunchManager.PREF_BREAK_PICKER_MINUTES, minutesBreakPicker.getValue());
ExerciseSet set = getCurrentSelectedExerciseSet();
long seconds = set.getExerciseSetTime(this);
long seconds = 0;
if(set != null) {
seconds = set.getExerciseSetTime(this);
}
if(seconds * 1000 > getCurrentSetBreakTime()) {
editor.putLong(PAUSE_TIME, seconds * 1000).apply();
} else {