Skip to content

Commit baf2821

Browse files
committed
suit type hotfix
1 parent 0dad3e4 commit baf2821

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

app/src/main/java/mavonie/subterminal/Forms/JumpForm.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,20 @@ protected void updateForm() {
293293

294294
this.date.setText(getItem().getDate());
295295
this.pilotChute.setSelection(Arrays.asList(Jump.getPcSizeArray()).indexOf(getItem().getPc_size()));
296-
this.jumpTypeSpinner.setSelection(getItem().getType(), false);
296+
297+
if (getItem().getType() != null) {
298+
this.jumpTypeSpinner.setSelection(getItem().getType(), false);
299+
}
297300

298301
this.suits.clear();
299-
this.suits.putAll(new Suit().getItemsForSpinner(convertTypes(getItem().getType())));
300-
this.suitsAdapter.notifyDataSetChanged();
302+
303+
if (getItem().getType() != null) {
304+
this.suits.putAll(new Suit().getItemsForSpinner(convertTypes(getItem().getType())));
305+
this.suitsAdapter.notifyDataSetChanged();
306+
}
301307
suitSpinner.setAdapter(this.suitsAdapter);
302308
if (getItem().getSuit_id() != null) {
309+
suitEntry = suitsAdapter.getItem(this.suitsAdapter.findPositionFromKey(getItem().getSuit_id()));
303310
suitSpinner.setSelection(this.suitsAdapter.findPositionFromKey(getItem().getSuit_id()), false);
304311
}
305312

app/src/main/java/mavonie/subterminal/Models/Jump.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,11 @@ public String getFormattedDelay() {
345345
}
346346

347347
public String getFormattedType() {
348-
return getTypeArray()[this.getType()];
348+
if(this.getType() != null) {
349+
return getTypeArray()[this.getType()];
350+
}
351+
352+
return null;
349353
}
350354

351355
@Override

0 commit comments

Comments
 (0)