diff --git a/libSafeMobile/src/main/java/com/safemobile/adapters/AlertGridViewAdapter.java b/libSafeMobile/src/main/java/com/safemobile/adapters/AlertGridViewAdapter.java index abaf299..d06236c 100644 --- a/libSafeMobile/src/main/java/com/safemobile/adapters/AlertGridViewAdapter.java +++ b/libSafeMobile/src/main/java/com/safemobile/adapters/AlertGridViewAdapter.java @@ -97,6 +97,10 @@ public class AlertGridViewAdapter extends BaseAdapter switch(acknowledged.get(position) ? 1 : 0) { case 1: + ViewGroup.LayoutParams params = convertView.getLayoutParams(); + if (params != null) { + params.height = 0; + } view.imageViewAlert.setImageResource(R.drawable.alert_off); //view.layoutAlarm.setBackgroundColor(0xffffffff); break; diff --git a/safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java index d2db467..4585b00 100644 --- a/safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java +++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java @@ -128,9 +128,12 @@ public class AlarmActivity extends Activity { setConvertViewAlarm(arg1); // save position ackPosition = position; - if (!AppParams.DEMO) + if (!AppParams.DEMO) { + getParentTab().getAlarms(AppParams.USERID); setACK(getAllAlarms().get(position).idx, getAllAlarms().get(position).type, getAllAlarms().get(position).unitName); - else { + acknowledged.set(position, true); + updateResultsInUi(ALARM); + } else { getAllAlarms().get(position).ack = 1; updateResultsInUi("else"); }