morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixed cursor empty checks.

Browse Source
This commit is contained in:
Armin Novak
2017-03-07 13:17:37 +01:00
parent f77b4a57dc
commit 1f1dae79e6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java
View File

@@ -157,7 +157,7 @@ public abstract class BookmarkBaseGateway {
Log.e(TAG, "More than one bookmark with the same label found!");
BookmarkBase bookmark = null;
if (cursor.moveToFirst())
if (cursor.moveToFirst() && (cursor.getCount() > 0))
bookmark = getBookmarkFromCursor(cursor);
cursor.close();
@@ -168,7 +168,7 @@ public abstract class BookmarkBaseGateway {
Cursor cursor = queryBookmarks("label LIKE '%" + pattern + "%'", "label");
ArrayList<BookmarkBase> bookmarks = new ArrayList<BookmarkBase>(cursor.getCount());
if (cursor.moveToFirst()) {
if (cursor.moveToFirst() && (cursor.getCount() > 0)) {
do {
bookmarks.add(getBookmarkFromCursor(cursor));
} while (cursor.moveToNext());
@@ -182,7 +182,7 @@ public abstract class BookmarkBaseGateway {
Cursor cursor = queryBookmarks(null, "label");
ArrayList<BookmarkBase> bookmarks = new ArrayList<BookmarkBase>(cursor.getCount());
if (cursor.moveToFirst()) {
if (cursor.moveToFirst() && (cursor.getCount() > 0)) {
do {
bookmarks.add(getBookmarkFromCursor(cursor));
} while (cursor.moveToNext());

4
client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/ManualBookmarkGateway.java
View File

@@ -77,7 +77,7 @@ public class ManualBookmarkGateway extends BookmarkBaseGateway {
Cursor cursor = queryBookmarks("label = '" + pattern + "' OR hostname = '" + pattern + "'", "label");
BookmarkBase bookmark = null;
if (cursor.moveToFirst())
if (cursor.moveToFirst() && (cursor.getCount() > 0))
bookmark = getBookmarkFromCursor(cursor);
cursor.close();
@@ -88,7 +88,7 @@ public class ManualBookmarkGateway extends BookmarkBaseGateway {
Cursor cursor = queryBookmarks("label LIKE '%" + pattern + "%' OR hostname LIKE '%" + pattern + "%'", "label");
ArrayList<BookmarkBase> bookmarks = new ArrayList<BookmarkBase>(cursor.getCount());
if (cursor.moveToFirst()) {
if (cursor.moveToFirst() && (cursor.getCount() > 0)) {
do {
bookmarks.add(getBookmarkFromCursor(cursor));
} while (cursor.moveToNext());