suit type hotfix

mattvb91 · Nov 27, 2016 · baf2821 · baf2821
1 parent 0dad3e4
commit baf2821
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/app/src/main/java/mavonie/subterminal/Forms/JumpForm.java b/app/src/main/java/mavonie/subterminal/Forms/JumpForm.java
@@ -293,13 +293,20 @@ protected void updateForm() {
 
             this.date.setText(getItem().getDate());
             this.pilotChute.setSelection(Arrays.asList(Jump.getPcSizeArray()).indexOf(getItem().getPc_size()));
-            this.jumpTypeSpinner.setSelection(getItem().getType(), false);
+
+            if (getItem().getType() != null) {
+                this.jumpTypeSpinner.setSelection(getItem().getType(), false);
+            }
 
             this.suits.clear();
-            this.suits.putAll(new Suit().getItemsForSpinner(convertTypes(getItem().getType())));
-            this.suitsAdapter.notifyDataSetChanged();
+
+            if (getItem().getType() != null) {
+                this.suits.putAll(new Suit().getItemsForSpinner(convertTypes(getItem().getType())));
+                this.suitsAdapter.notifyDataSetChanged();
+            }
             suitSpinner.setAdapter(this.suitsAdapter);
             if (getItem().getSuit_id() != null) {
+                suitEntry = suitsAdapter.getItem(this.suitsAdapter.findPositionFromKey(getItem().getSuit_id()));
                 suitSpinner.setSelection(this.suitsAdapter.findPositionFromKey(getItem().getSuit_id()), false);
             }
 

diff --git a/app/src/main/java/mavonie/subterminal/Models/Jump.java b/app/src/main/java/mavonie/subterminal/Models/Jump.java
@@ -345,7 +345,11 @@ public String getFormattedDelay() {
     }
 
     public String getFormattedType() {
-        return getTypeArray()[this.getType()];
+        if(this.getType() != null) {
+            return getTypeArray()[this.getType()];
+        }
+
+        return null;
     }
 
     @Override