/*
- * Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
*
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
*
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with Privacy Browser. If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android. If not, see <http://www.gnu.org/licenses/>.
*/
package com.stoutner.privacybrowser.helpers;
// Get the folder name.
folderCursor.moveToFirst();
- String folderName = folderCursor.getString(folderCursor.getColumnIndex(BOOKMARK_NAME));
+ String folderName = folderCursor.getString(folderCursor.getColumnIndexOrThrow(BOOKMARK_NAME));
// Close the cursor and the database handle.
folderCursor.close();
// Get the database ID.
folderCursor.moveToFirst();
- int databaseId = folderCursor.getInt(folderCursor.getColumnIndex(_ID));
+ int databaseId = folderCursor.getInt(folderCursor.getColumnIndexOrThrow(_ID));
// Close the cursor and the database handle.
folderCursor.close();
bookmarkCursor.moveToFirst();
// Store the name of the parent folder.
- String parentFolder = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(PARENT_FOLDER));
+ String parentFolder = bookmarkCursor.getString(bookmarkCursor.getColumnIndexOrThrow(PARENT_FOLDER));
// Close the cursor.
bookmarkCursor.close();
bookmarkCursor.moveToFirst();
// Store the name of the parent folder.
- String parentFolder = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(PARENT_FOLDER));
+ String parentFolder = bookmarkCursor.getString(bookmarkCursor.getColumnIndexOrThrow(PARENT_FOLDER));
// Close the cursor.
bookmarkCursor.close();
}
// Get a cursor with just database ID of bookmarks and folders in the specified folder. This is useful for deleting folders with bookmarks that have favorite icons too large to fit in a cursor.
- public Cursor getBookmarkIDs(String folderName) {
+ public Cursor getBookmarkIds(String folderName) {
// Get a readable database handle.
SQLiteDatabase bookmarksDatabase = this.getReadableDatabase();
// Ascertain if this database ID is a folder.
folderCursor.moveToFirst();
- boolean isFolder = (folderCursor.getInt(folderCursor.getColumnIndex(IS_FOLDER)) == 1);
+ boolean isFolder = (folderCursor.getInt(folderCursor.getColumnIndexOrThrow(IS_FOLDER)) == 1);
// Close the cursor and the database handle.
folderCursor.close();
newFolderCursor.moveToLast();
// Set the display order to be one greater that the last bookmark.
- displayOrder = newFolderCursor.getInt(newFolderCursor.getColumnIndex(DISPLAY_ORDER)) + 1;
+ displayOrder = newFolderCursor.getInt(newFolderCursor.getColumnIndexOrThrow(DISPLAY_ORDER)) + 1;
} else { // There are no bookmarks in the new folder.
// Set the display order to be `0`.
displayOrder = 0;