Merge pull request #1105 from Zahnstocher/duplicate_favourites_fix
Fix duplicate favourites again (issue 2400)
This commit is contained in:
commit
c206555767
2 changed files with 2 additions and 1 deletions
|
@ -196,7 +196,6 @@ public class FavouritesDbHelper {
|
||||||
} else {
|
} else {
|
||||||
builder.setMessage(uiContext.getString(R.string.fav_point_dublicate_message, name));
|
builder.setMessage(uiContext.getString(R.string.fav_point_dublicate_message, name));
|
||||||
}
|
}
|
||||||
builder.setPositiveButton(R.string.shared_string_ok, null);
|
|
||||||
p.setName(name);
|
p.setName(name);
|
||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
|
@ -231,6 +230,7 @@ public class FavouritesDbHelper {
|
||||||
++index;
|
++index;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
builder.trimToSize(); // remove trailing null characters
|
||||||
return builder.toString();
|
return builder.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -221,6 +221,7 @@ public class FavoriteDialogs {
|
||||||
addFavorite(activity, point, helper);
|
addFavorite(activity, point, helper);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
bld.show();
|
||||||
} else {
|
} else {
|
||||||
addFavorite(activity, point, helper);
|
addFavorite(activity, point, helper);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue