nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adressed some of the observations made re the last commits.

master
Daniele Gobbetti 2015-06-27 18:56:05 +02:00
parent 371a7bb4af
commit 3068d687bf
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java
View File

@ -190,6 +190,7 @@ public class GBAlarm implements Parcelable, Comparable {
String alarmString = iterator.next(); String alarmString = iterator.next();
if(this.equals(new GBAlarm(alarmString))) { if(this.equals(new GBAlarm(alarmString))) {
iterator.remove(); iterator.remove();
break;
} }
} }
newPrefs.add(this.toPreferences()); newPrefs.add(this.toPreferences());

18
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
View File

@ -40,13 +40,8 @@ public class GBAlarmListAdapter extends ArrayAdapter<GBAlarm> {
this.mContext = context; this.mContext = context;
alarmList = new ArrayList<GBAlarm>(); alarmList = new ArrayList<GBAlarm>();
if (preferencesAlarmListSet != null) { for (String alarmString : preferencesAlarmListSet) {
Iterator<String> iterator = preferencesAlarmListSet.iterator(); alarmList.add(new GBAlarm(alarmString));
while (iterator.hasNext()) {
String alarmString = iterator.next();
alarmList.add(new GBAlarm(alarmString));
}
} }
Collections.sort(alarmList); Collections.sort(alarmList);
@ -55,13 +50,8 @@ public class GBAlarmListAdapter extends ArrayAdapter<GBAlarm> {
public void setAlarmList(Set<String> preferencesAlarmListSet) { public void setAlarmList(Set<String> preferencesAlarmListSet) {
alarmList = new ArrayList<GBAlarm>(); alarmList = new ArrayList<GBAlarm>();
if (preferencesAlarmListSet != null) { for (String alarmString : preferencesAlarmListSet) {
Iterator<String> iterator = preferencesAlarmListSet.iterator(); alarmList.add(new GBAlarm(alarmString));
while (iterator.hasNext()) {
String alarmString = iterator.next();
alarmList.add(new GBAlarm(alarmString));
}
} }
Collections.sort(alarmList); Collections.sort(alarmList);