nullcheck

prevent NPE (#556)
forrestguice · Feb 13, 2022 · 462053e · 462053e
1 parent 50d663c
commit 462053e
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/app/src/main/java/com/forrestguice/suntimeswidget/SuntimesActivity.java b/app/src/main/java/com/forrestguice/suntimeswidget/SuntimesActivity.java
@@ -1941,15 +1941,14 @@ public boolean onMoonHeaderLongClick(CardAdapter adapter, int position) {
 
         @Override
         public void onLightmapClick(CardAdapter adapter, int position) {
-            if (Math.abs(CardAdapter.TODAY_POSITION - position) > 1) {
-                showSunPositionAt(adapter.initData(SuntimesActivity.this, position).first.dataNoon.calendar().getTimeInMillis());
+            Pair<SuntimesRiseSetDataset, SuntimesMoonData> cardData = adapter.initData(SuntimesActivity.this, position);
+            if (Math.abs(CardAdapter.TODAY_POSITION - position) > 1 && cardData != null) {
+                showSunPositionAt(cardData.first.dataNoon.calendar().getTimeInMillis());
             } else showLightMapDialog();
         }
         @Override
         public boolean onLightmapLongClick(CardAdapter adapter, int position) {
-            if (Math.abs(CardAdapter.TODAY_POSITION - position) > 1) {
-                showSunPositionAt(adapter.initData(SuntimesActivity.this, position).first.dataNoon.calendar().getTimeInMillis());
-            } else showLightMapDialog();
+            onLightmapClick(adapter, position);
             return true;
         }