The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2006 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
| 17 | package com.android.browser; |
| 18 | |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 19 | import com.android.browser.provider.BrowserProvider2; |
| 20 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 21 | import android.app.Activity; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 22 | import android.app.LoaderManager; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 23 | import android.content.ContentResolver; |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 24 | import android.content.ContentUris; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 25 | import android.content.ContentValues; |
| 26 | import android.content.Context; |
| 27 | import android.content.CursorLoader; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 28 | import android.content.Loader; |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 29 | import android.content.SharedPreferences; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 30 | import android.content.res.Resources; |
Patrick Scott | 3918d44 | 2009-08-04 13:22:29 -0400 | [diff] [blame] | 31 | import android.database.Cursor; |
Ben Murdoch | aac7aa6 | 2009-09-17 16:57:40 +0100 | [diff] [blame] | 32 | import android.graphics.Bitmap; |
Leon Scroggins | 0208194 | 2010-11-01 17:52:42 -0400 | [diff] [blame] | 33 | import android.graphics.drawable.Drawable; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 34 | import android.net.ParseException; |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 35 | import android.net.Uri; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 36 | import android.net.WebAddress; |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 37 | import android.os.AsyncTask; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 38 | import android.os.Bundle; |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 39 | import android.os.Handler; |
| 40 | import android.os.Message; |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 41 | import android.preference.PreferenceManager; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 42 | import android.provider.BrowserContract; |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 43 | import android.text.TextUtils; |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 44 | import android.util.AttributeSet; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 45 | import android.view.KeyEvent; |
| 46 | import android.view.LayoutInflater; |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 47 | import android.view.MenuItem; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 48 | import android.view.View; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 49 | import android.view.ViewGroup; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 50 | import android.view.Window; |
Leon Scroggins III | 76a0e9c | 2010-10-05 16:10:01 -0400 | [diff] [blame] | 51 | import android.view.WindowManager; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 52 | import android.view.inputmethod.EditorInfo; |
| 53 | import android.view.inputmethod.InputMethodManager; |
| 54 | import android.widget.AdapterView; |
| 55 | import android.widget.CursorAdapter; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 56 | import android.widget.EditText; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 57 | import android.widget.ListView; |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 58 | import android.widget.PopupMenu; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 59 | import android.widget.TextView; |
| 60 | import android.widget.Toast; |
| 61 | |
Cary Clark | f2407c6 | 2009-09-04 12:25:10 -0400 | [diff] [blame] | 62 | import java.net.URI; |
| 63 | import java.net.URISyntaxException; |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 64 | import java.util.Stack; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 65 | |
| 66 | public class AddBookmarkPage extends Activity |
| 67 | implements View.OnClickListener, TextView.OnEditorActionListener, |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 68 | AdapterView.OnItemClickListener, LoaderManager.LoaderCallbacks<Cursor>, |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 69 | BreadCrumbView.Controller, PopupMenu.OnMenuItemClickListener { |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 70 | |
Michael Kolb | 370a4f3 | 2010-10-06 10:45:32 -0700 | [diff] [blame] | 71 | public static final long DEFAULT_FOLDER_ID = -1; |
Leon Scroggins | bc92285 | 2010-10-22 12:15:27 -0400 | [diff] [blame] | 72 | public static final String TOUCH_ICON_URL = "touch_icon_url"; |
| 73 | // Place on an edited bookmark to remove the saved thumbnail |
| 74 | public static final String REMOVE_THUMBNAIL = "remove_thumbnail"; |
| 75 | public static final String USER_AGENT = "user_agent"; |
Michael Kolb | 370a4f3 | 2010-10-06 10:45:32 -0700 | [diff] [blame] | 76 | |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 77 | /* package */ static final String EXTRA_EDIT_BOOKMARK = "bookmark"; |
| 78 | /* package */ static final String EXTRA_IS_FOLDER = "is_folder"; |
| 79 | |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 80 | private static final int MAX_CRUMBS_SHOWN = 2; |
| 81 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 82 | private final String LOGTAG = "Bookmarks"; |
| 83 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 84 | // IDs for the CursorLoaders that are used. |
| 85 | private final int LOADER_ID_FOLDER_CONTENTS = 0; |
| 86 | private final int LOADER_ID_ALL_FOLDERS = 1; |
| 87 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 88 | private EditText mTitle; |
| 89 | private EditText mAddress; |
| 90 | private TextView mButton; |
| 91 | private View mCancelButton; |
| 92 | private boolean mEditingExisting; |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 93 | private boolean mEditingFolder; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 94 | private Bundle mMap; |
Patrick Scott | 3918d44 | 2009-08-04 13:22:29 -0400 | [diff] [blame] | 95 | private String mTouchIconUrl; |
Ben Murdoch | aac7aa6 | 2009-09-17 16:57:40 +0100 | [diff] [blame] | 96 | private String mOriginalUrl; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 97 | private TextView mFolder; |
| 98 | private View mDefaultView; |
| 99 | private View mFolderSelector; |
| 100 | private EditText mFolderNamer; |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 101 | private boolean mIsFolderNamerShowing; |
| 102 | private View mFolderNamerHolder; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 103 | private View mAddNewFolder; |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 104 | private View mAddSeparator; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 105 | private long mCurrentFolder = 0; |
| 106 | private FolderAdapter mAdapter; |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 107 | private BreadCrumbView mCrumbs; |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 108 | private TextView mFakeTitle; |
| 109 | private View mCrumbHolder; |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 110 | private CustomListView mListView; |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 111 | private boolean mSaveToHomeScreen; |
Leon Scroggins | 0208194 | 2010-11-01 17:52:42 -0400 | [diff] [blame] | 112 | private long mRootFolder; |
Leon Scroggins | 905250c | 2010-12-17 15:25:33 -0500 | [diff] [blame] | 113 | private TextView mTopLevelLabel; |
| 114 | private Drawable mHeaderIcon; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 115 | |
| 116 | private static class Folder { |
| 117 | String Name; |
| 118 | long Id; |
| 119 | Folder(String name, long id) { |
| 120 | Name = name; |
| 121 | Id = id; |
| 122 | } |
| 123 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 124 | |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 125 | // Message IDs |
| 126 | private static final int SAVE_BOOKMARK = 100; |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 127 | private static final int TOUCH_ICON_DOWNLOADED = 101; |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 128 | |
| 129 | private Handler mHandler; |
| 130 | |
Bjorn Bringert | b1402a5 | 2010-10-12 10:53:12 +0100 | [diff] [blame] | 131 | private InputMethodManager getInputMethodManager() { |
| 132 | return (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE); |
| 133 | } |
| 134 | |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 135 | private Uri getUriForFolder(long folder) { |
| 136 | Uri uri; |
| 137 | if (folder == mRootFolder) { |
| 138 | uri = BrowserContract.Bookmarks.CONTENT_URI_DEFAULT_FOLDER; |
| 139 | } else { |
| 140 | uri = BrowserContract.Bookmarks.buildFolderUri(folder); |
| 141 | } |
| 142 | String[] accountInfo = getAccountNameAndType(this); |
| 143 | if (accountInfo != null) { |
| 144 | uri = BookmarksLoader.addAccount(uri, accountInfo[1], accountInfo[0]); |
| 145 | } |
| 146 | return uri; |
| 147 | } |
| 148 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 149 | @Override |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 150 | public void onTop(int level, Object data) { |
| 151 | if (null == data) return; |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 152 | Folder folderData = (Folder) data; |
| 153 | long folder = folderData.Id; |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 154 | LoaderManager manager = getLoaderManager(); |
| 155 | CursorLoader loader = (CursorLoader) ((Loader) manager.getLoader( |
| 156 | LOADER_ID_FOLDER_CONTENTS)); |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 157 | loader.setUri(getUriForFolder(folder)); |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 158 | loader.forceLoad(); |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 159 | if (mIsFolderNamerShowing) { |
Leon Scroggins | 6573f9e | 2010-10-18 17:22:35 -0400 | [diff] [blame] | 160 | completeOrCancelFolderNaming(true); |
| 161 | } |
Leon Scroggins | 905250c | 2010-12-17 15:25:33 -0500 | [diff] [blame] | 162 | setShowBookmarkIcon(level == 1); |
| 163 | } |
| 164 | |
| 165 | /** |
| 166 | * Show or hide the icon for bookmarks next to "Bookmarks" in the crumb view. |
| 167 | * @param show True if the icon should visible, false otherwise. |
| 168 | */ |
| 169 | private void setShowBookmarkIcon(boolean show) { |
| 170 | Drawable drawable = show ? mHeaderIcon: null; |
| 171 | mTopLevelLabel.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null); |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 172 | } |
| 173 | |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 174 | @Override |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 175 | public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { |
| 176 | if (v == mFolderNamer) { |
| 177 | if (v.getText().length() > 0) { |
| 178 | if (actionId == EditorInfo.IME_NULL) { |
| 179 | // Only want to do this once. |
| 180 | if (event.getAction() == KeyEvent.ACTION_UP) { |
Leon Scroggins | 6573f9e | 2010-10-18 17:22:35 -0400 | [diff] [blame] | 181 | completeOrCancelFolderNaming(false); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 182 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 183 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 184 | } |
Michael Kolb | 31829b9 | 2010-10-01 11:50:21 -0700 | [diff] [blame] | 185 | // Steal the key press; otherwise a newline will be added |
| 186 | return true; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 187 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 188 | return false; |
| 189 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 190 | |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 191 | private void switchToDefaultView(boolean changedFolder) { |
| 192 | mFolderSelector.setVisibility(View.GONE); |
| 193 | mDefaultView.setVisibility(View.VISIBLE); |
| 194 | mCrumbHolder.setVisibility(View.GONE); |
| 195 | mFakeTitle.setVisibility(View.VISIBLE); |
| 196 | if (changedFolder) { |
| 197 | Object data = mCrumbs.getTopData(); |
| 198 | if (data != null) { |
| 199 | Folder folder = (Folder) data; |
| 200 | mCurrentFolder = folder.Id; |
Leon Scroggins | 0208194 | 2010-11-01 17:52:42 -0400 | [diff] [blame] | 201 | int resource = mCurrentFolder == mRootFolder ? |
| 202 | R.drawable.ic_menu_bookmarks : |
| 203 | com.android.internal.R.drawable.ic_menu_archive; |
| 204 | Drawable drawable = getResources().getDrawable(resource); |
| 205 | updateFolderLabel(folder.Name, drawable); |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 206 | } |
| 207 | } |
| 208 | } |
| 209 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 210 | @Override |
| 211 | public void onClick(View v) { |
| 212 | if (v == mButton) { |
| 213 | if (mFolderSelector.getVisibility() == View.VISIBLE) { |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 214 | // We are showing the folder selector. |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 215 | if (mIsFolderNamerShowing) { |
Leon Scroggins | 6573f9e | 2010-10-18 17:22:35 -0400 | [diff] [blame] | 216 | completeOrCancelFolderNaming(false); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 217 | } else { |
| 218 | // User has selected a folder. Go back to the opening page |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 219 | mSaveToHomeScreen = false; |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 220 | switchToDefaultView(true); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 221 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 222 | } else if (save()) { |
| 223 | finish(); |
| 224 | } |
| 225 | } else if (v == mCancelButton) { |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 226 | if (mIsFolderNamerShowing) { |
Leon Scroggins | 6573f9e | 2010-10-18 17:22:35 -0400 | [diff] [blame] | 227 | completeOrCancelFolderNaming(true); |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 228 | } else if (mFolderSelector.getVisibility() == View.VISIBLE) { |
| 229 | switchToDefaultView(false); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 230 | } else { |
| 231 | finish(); |
| 232 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 233 | } else if (v == mFolder) { |
Leon Scroggins | 26318a1 | 2010-11-08 10:08:40 -0500 | [diff] [blame] | 234 | PopupMenu popup = new PopupMenu(this, mFolder); |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 235 | popup.getMenuInflater().inflate(R.menu.folder_choice, |
| 236 | popup.getMenu()); |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 237 | if (mEditingFolder) { |
| 238 | popup.getMenu().removeItem(R.id.home_screen); |
| 239 | } |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 240 | popup.setOnMenuItemClickListener(this); |
| 241 | popup.show(); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 242 | } else if (v == mAddNewFolder) { |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 243 | setShowFolderNamer(true); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 244 | mFolderNamer.setText(R.string.new_folder); |
| 245 | mFolderNamer.requestFocus(); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 246 | mAddNewFolder.setVisibility(View.GONE); |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 247 | mAddSeparator.setVisibility(View.GONE); |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 248 | InputMethodManager imm = getInputMethodManager(); |
| 249 | // Set the InputMethodManager to focus on the ListView so that it |
| 250 | // can transfer the focus to mFolderNamer. |
| 251 | imm.focusIn(mListView); |
| 252 | imm.showSoftInput(mFolderNamer, InputMethodManager.SHOW_IMPLICIT); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 253 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 254 | } |
| 255 | |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 256 | @Override |
| 257 | public boolean onMenuItemClick(MenuItem item) { |
| 258 | switch(item.getItemId()) { |
| 259 | case R.id.bookmarks: |
Leon Scroggins | 0208194 | 2010-11-01 17:52:42 -0400 | [diff] [blame] | 260 | mCurrentFolder = mRootFolder; |
| 261 | updateFolderLabel(item.getTitle(), item.getIcon()); |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 262 | mSaveToHomeScreen = false; |
| 263 | break; |
| 264 | case R.id.home_screen: |
| 265 | // Create a short cut to the home screen |
| 266 | mSaveToHomeScreen = true; |
Leon Scroggins | 0208194 | 2010-11-01 17:52:42 -0400 | [diff] [blame] | 267 | updateFolderLabel(item.getTitle(), item.getIcon()); |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 268 | break; |
| 269 | case R.id.other: |
| 270 | switchToFolderSelector(); |
| 271 | break; |
| 272 | default: |
| 273 | return false; |
| 274 | } |
| 275 | return true; |
| 276 | } |
| 277 | |
Leon Scroggins | 6573f9e | 2010-10-18 17:22:35 -0400 | [diff] [blame] | 278 | private void completeOrCancelFolderNaming(boolean cancel) { |
| 279 | if (!cancel && !TextUtils.isEmpty(mFolderNamer.getText())) { |
Michael Kolb | 31829b9 | 2010-10-01 11:50:21 -0700 | [diff] [blame] | 280 | String name = mFolderNamer.getText().toString(); |
| 281 | long id = addFolderToCurrent(mFolderNamer.getText().toString()); |
| 282 | descendInto(name, id); |
Michael Kolb | 31829b9 | 2010-10-01 11:50:21 -0700 | [diff] [blame] | 283 | } |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 284 | setShowFolderNamer(false); |
Leon Scroggins | 6573f9e | 2010-10-18 17:22:35 -0400 | [diff] [blame] | 285 | mAddNewFolder.setVisibility(View.VISIBLE); |
| 286 | mAddSeparator.setVisibility(View.VISIBLE); |
| 287 | getInputMethodManager().hideSoftInputFromWindow( |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 288 | mListView.getWindowToken(), 0); |
Michael Kolb | 31829b9 | 2010-10-01 11:50:21 -0700 | [diff] [blame] | 289 | } |
| 290 | |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 291 | private long addFolderToCurrent(String name) { |
| 292 | // Add the folder to the database |
| 293 | ContentValues values = new ContentValues(); |
| 294 | values.put(BrowserContract.Bookmarks.TITLE, |
| 295 | name); |
| 296 | values.put(BrowserContract.Bookmarks.IS_FOLDER, 1); |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 297 | String[] accountInfo = getAccountNameAndType(this); |
| 298 | if (accountInfo != null) { |
| 299 | values.put(BrowserContract.Bookmarks.ACCOUNT_TYPE, accountInfo[1]); |
| 300 | values.put(BrowserContract.Bookmarks.ACCOUNT_NAME, accountInfo[0]); |
John Reck | e89daa9 | 2010-11-05 14:39:39 -0700 | [diff] [blame] | 301 | } |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 302 | long currentFolder; |
| 303 | Object data = mCrumbs.getTopData(); |
| 304 | if (data != null) { |
| 305 | currentFolder = ((Folder) data).Id; |
| 306 | } else { |
Leon Scroggins | 0208194 | 2010-11-01 17:52:42 -0400 | [diff] [blame] | 307 | currentFolder = mRootFolder; |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 308 | } |
| 309 | values.put(BrowserContract.Bookmarks.PARENT, currentFolder); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 310 | Uri uri = getContentResolver().insert( |
| 311 | BrowserContract.Bookmarks.CONTENT_URI, values); |
| 312 | if (uri != null) { |
| 313 | return ContentUris.parseId(uri); |
| 314 | } else { |
| 315 | return -1; |
| 316 | } |
| 317 | } |
| 318 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 319 | private void switchToFolderSelector() { |
| 320 | mDefaultView.setVisibility(View.GONE); |
| 321 | mFolderSelector.setVisibility(View.VISIBLE); |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 322 | mCrumbHolder.setVisibility(View.VISIBLE); |
| 323 | mFakeTitle.setVisibility(View.GONE); |
| 324 | mAddNewFolder.setVisibility(View.VISIBLE); |
| 325 | mAddSeparator.setVisibility(View.VISIBLE); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 326 | } |
| 327 | |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 328 | private void descendInto(String foldername, long id) { |
Michael Kolb | 370a4f3 | 2010-10-06 10:45:32 -0700 | [diff] [blame] | 329 | if (id != DEFAULT_FOLDER_ID) { |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 330 | mCrumbs.pushView(foldername, new Folder(foldername, id)); |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 331 | mCrumbs.notifyController(); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 332 | } |
| 333 | } |
| 334 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 335 | @Override |
| 336 | public Loader<Cursor> onCreateLoader(int id, Bundle args) { |
| 337 | String[] projection; |
| 338 | switch (id) { |
| 339 | case LOADER_ID_ALL_FOLDERS: |
| 340 | projection = new String[] { |
| 341 | BrowserContract.Bookmarks._ID, |
| 342 | BrowserContract.Bookmarks.PARENT, |
| 343 | BrowserContract.Bookmarks.TITLE, |
| 344 | BrowserContract.Bookmarks.IS_FOLDER |
| 345 | }; |
| 346 | return new CursorLoader(this, |
| 347 | BrowserContract.Bookmarks.CONTENT_URI, |
| 348 | projection, |
| 349 | BrowserContract.Bookmarks.IS_FOLDER + " != 0", |
| 350 | null, |
| 351 | null); |
| 352 | case LOADER_ID_FOLDER_CONTENTS: |
| 353 | projection = new String[] { |
| 354 | BrowserContract.Bookmarks._ID, |
| 355 | BrowserContract.Bookmarks.TITLE, |
| 356 | BrowserContract.Bookmarks.IS_FOLDER |
| 357 | }; |
Leon Scroggins | c112990 | 2010-12-08 15:28:33 -0500 | [diff] [blame] | 358 | String where = BrowserContract.Bookmarks.IS_FOLDER + " != 0"; |
| 359 | if (mEditingFolder) { |
| 360 | where += " AND " + BrowserContract.Bookmarks._ID + " != " |
| 361 | + mMap.getLong(BrowserContract.Bookmarks._ID); |
| 362 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 363 | return new CursorLoader(this, |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 364 | getUriForFolder(mCurrentFolder), |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 365 | projection, |
Leon Scroggins | c112990 | 2010-12-08 15:28:33 -0500 | [diff] [blame] | 366 | where, |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 367 | null, |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 368 | BrowserContract.Bookmarks._ID + " ASC"); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 369 | default: |
| 370 | throw new AssertionError("Asking for nonexistant loader!"); |
| 371 | } |
| 372 | } |
| 373 | |
| 374 | @Override |
| 375 | public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) { |
| 376 | switch (loader.getId()) { |
| 377 | case LOADER_ID_FOLDER_CONTENTS: |
| 378 | mAdapter.changeCursor(cursor); |
| 379 | break; |
| 380 | case LOADER_ID_ALL_FOLDERS: |
| 381 | long parent = mCurrentFolder; |
| 382 | int idIndex = cursor.getColumnIndexOrThrow( |
| 383 | BrowserContract.Bookmarks._ID); |
| 384 | int titleIndex = cursor.getColumnIndexOrThrow( |
| 385 | BrowserContract.Bookmarks.TITLE); |
| 386 | int parentIndex = cursor.getColumnIndexOrThrow( |
| 387 | BrowserContract.Bookmarks.PARENT); |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 388 | // If the user is editing anything inside the "Other Bookmarks" |
| 389 | // folder, we need to stop searching up when we reach its parent. |
| 390 | // Find the root folder |
| 391 | moveCursorToFolder(cursor, mRootFolder, idIndex); |
| 392 | // omniparent is the folder which contains root, and therefore |
| 393 | // also the parent of the "Other Bookmarks" folder. |
| 394 | long omniparent = cursor.getLong(parentIndex); |
| 395 | Stack<Folder> folderStack = new Stack<Folder>(); |
| 396 | while ((parent != mRootFolder) && (parent != 0) && (parent != omniparent)) { |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 397 | // First, find the folder corresponding to the current |
| 398 | // folder |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 399 | moveCursorToFolder(cursor, parent, idIndex); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 400 | String name = cursor.getString(titleIndex); |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 401 | if (parent == mCurrentFolder) { |
Leon Scroggins | 0208194 | 2010-11-01 17:52:42 -0400 | [diff] [blame] | 402 | Drawable draw = getResources().getDrawable( |
| 403 | com.android.internal.R.drawable.ic_menu_archive); |
| 404 | updateFolderLabel(name, draw); |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 405 | } |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 406 | folderStack.push(new Folder(name, parent)); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 407 | parent = cursor.getLong(parentIndex); |
| 408 | } |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 409 | while (!folderStack.isEmpty()) { |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 410 | Folder thisFolder = folderStack.pop(); |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 411 | mCrumbs.pushView(thisFolder.Name, thisFolder); |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 412 | } |
Dianne Hackborn | 71e76c7 | 2010-12-20 11:44:09 -0800 | [diff] [blame] | 413 | getLoaderManager().destroyLoader(LOADER_ID_ALL_FOLDERS); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 414 | break; |
| 415 | default: |
| 416 | break; |
| 417 | } |
| 418 | } |
| 419 | |
Dianne Hackborn | 39772c8 | 2010-12-16 00:43:54 -0800 | [diff] [blame] | 420 | public void onLoaderReset(Loader<Cursor> loader) { |
| 421 | switch (loader.getId()) { |
| 422 | case LOADER_ID_FOLDER_CONTENTS: |
| 423 | mAdapter.changeCursor(null); |
| 424 | break; |
| 425 | } |
| 426 | } |
| 427 | |
Leon Scroggins | 0208194 | 2010-11-01 17:52:42 -0400 | [diff] [blame] | 428 | /** |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 429 | * Move cursor to the position that has folderToFind as its "_id". |
| 430 | * @param cursor Cursor containing folders in the bookmarks database |
| 431 | * @param folderToFind "_id" of the folder to move to. |
| 432 | * @param idIndex Index in cursor of "_id" |
| 433 | * @throws AssertionError if cursor is empty or there is no row with folderToFind |
| 434 | * as its "_id". |
| 435 | */ |
| 436 | void moveCursorToFolder(Cursor cursor, long folderToFind, int idIndex) |
| 437 | throws AssertionError { |
| 438 | if (!cursor.moveToFirst()) { |
| 439 | throw new AssertionError("No folders in the database!"); |
| 440 | } |
| 441 | long folder; |
| 442 | do { |
| 443 | folder = cursor.getLong(idIndex); |
| 444 | } while (folder != folderToFind && cursor.moveToNext()); |
| 445 | if (cursor.isAfterLast()) { |
| 446 | throw new AssertionError("Folder(id=" + folderToFind |
| 447 | + ") holding this bookmark does not exist!"); |
| 448 | } |
| 449 | } |
| 450 | |
| 451 | /** |
Leon Scroggins | 0208194 | 2010-11-01 17:52:42 -0400 | [diff] [blame] | 452 | * Update the name and image to show where the bookmark will be added |
| 453 | * @param name Name of the location to save (folder name, bookmarks, or home |
| 454 | * screen. |
| 455 | * @param drawable Image to show corresponding to the save location. |
| 456 | */ |
| 457 | void updateFolderLabel(CharSequence name, Drawable drawable) { |
| 458 | mFolder.setText(name); |
| 459 | mFolder.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, |
| 460 | null); |
| 461 | } |
| 462 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 463 | @Override |
| 464 | public void onItemClick(AdapterView<?> parent, View view, int position, |
| 465 | long id) { |
Leon Scroggins | d14cb12 | 2010-09-29 16:01:48 -0400 | [diff] [blame] | 466 | TextView tv = (TextView) view.findViewById(android.R.id.text1); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 467 | // Switch to the folder that was clicked on. |
Leon Scroggins | d14cb12 | 2010-09-29 16:01:48 -0400 | [diff] [blame] | 468 | descendInto(tv.getText().toString(), id); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 469 | } |
| 470 | |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 471 | private void setShowFolderNamer(boolean show) { |
| 472 | if (show != mIsFolderNamerShowing) { |
| 473 | mIsFolderNamerShowing = show; |
| 474 | if (show) { |
| 475 | // Set the selection to the folder namer so it will be in |
| 476 | // view. |
| 477 | mListView.addFooterView(mFolderNamerHolder); |
| 478 | } else { |
| 479 | mListView.removeFooterView(mFolderNamerHolder); |
| 480 | } |
| 481 | // Refresh the list. |
| 482 | mListView.setAdapter(mAdapter); |
| 483 | if (show) { |
| 484 | mListView.setSelection(mListView.getCount() - 1); |
| 485 | } |
| 486 | } |
| 487 | } |
| 488 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 489 | /** |
| 490 | * Shows a list of names of folders. |
| 491 | */ |
| 492 | private class FolderAdapter extends CursorAdapter { |
| 493 | public FolderAdapter(Context context) { |
| 494 | super(context, null); |
| 495 | } |
| 496 | |
| 497 | @Override |
| 498 | public void bindView(View view, Context context, Cursor cursor) { |
| 499 | ((TextView) view.findViewById(android.R.id.text1)).setText( |
| 500 | cursor.getString(cursor.getColumnIndexOrThrow( |
| 501 | BrowserContract.Bookmarks.TITLE))); |
| 502 | } |
| 503 | |
| 504 | @Override |
| 505 | public View newView(Context context, Cursor cursor, ViewGroup parent) { |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 506 | View view = LayoutInflater.from(context).inflate( |
| 507 | R.layout.folder_list_item, null); |
| 508 | view.setBackgroundDrawable(context.getResources(). |
| 509 | getDrawable(android.R.drawable.list_selector_background)); |
| 510 | return view; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 511 | } |
Leon Scroggins | 6573f9e | 2010-10-18 17:22:35 -0400 | [diff] [blame] | 512 | |
| 513 | @Override |
| 514 | public boolean isEmpty() { |
| 515 | // Do not show the empty view if the user is creating a new folder. |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 516 | return super.isEmpty() && !mIsFolderNamerShowing; |
Leon Scroggins | 6573f9e | 2010-10-18 17:22:35 -0400 | [diff] [blame] | 517 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 518 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 519 | |
Leon Scroggins | c112990 | 2010-12-08 15:28:33 -0500 | [diff] [blame] | 520 | @Override |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 521 | protected void onCreate(Bundle icicle) { |
| 522 | super.onCreate(icicle); |
Leon Scroggins | 7453ff2 | 2010-12-15 16:03:59 -0500 | [diff] [blame] | 523 | requestWindowFeature(Window.FEATURE_NO_TITLE); |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 524 | |
| 525 | mMap = getIntent().getExtras(); |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 526 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 527 | setContentView(R.layout.browser_add_bookmark); |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 528 | |
Leon Scroggins III | 76a0e9c | 2010-10-05 16:10:01 -0400 | [diff] [blame] | 529 | Window window = getWindow(); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 530 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 531 | String title = null; |
| 532 | String url = null; |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 533 | |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 534 | mFakeTitle = (TextView) findViewById(R.id.fake_title); |
| 535 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 536 | if (mMap != null) { |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 537 | Bundle b = mMap.getBundle(EXTRA_EDIT_BOOKMARK); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 538 | if (b != null) { |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 539 | mEditingFolder = mMap.getBoolean(EXTRA_IS_FOLDER, false); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 540 | mMap = b; |
| 541 | mEditingExisting = true; |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 542 | mFakeTitle.setText(R.string.edit_bookmark); |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 543 | if (mEditingFolder) { |
| 544 | findViewById(R.id.row_address).setVisibility(View.GONE); |
| 545 | } |
Leon Scroggins III | 76a0e9c | 2010-10-05 16:10:01 -0400 | [diff] [blame] | 546 | } else { |
| 547 | int gravity = mMap.getInt("gravity", -1); |
| 548 | if (gravity != -1) { |
| 549 | WindowManager.LayoutParams l = window.getAttributes(); |
| 550 | l.gravity = gravity; |
| 551 | window.setAttributes(l); |
| 552 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 553 | } |
Leon Scroggins | bc92285 | 2010-10-22 12:15:27 -0400 | [diff] [blame] | 554 | title = mMap.getString(BrowserContract.Bookmarks.TITLE); |
| 555 | url = mOriginalUrl = mMap.getString(BrowserContract.Bookmarks.URL); |
| 556 | mTouchIconUrl = mMap.getString(TOUCH_ICON_URL); |
Michael Kolb | 370a4f3 | 2010-10-06 10:45:32 -0700 | [diff] [blame] | 557 | mCurrentFolder = mMap.getLong(BrowserContract.Bookmarks.PARENT, DEFAULT_FOLDER_ID); |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 558 | } |
Leon Scroggins | 0208194 | 2010-11-01 17:52:42 -0400 | [diff] [blame] | 559 | mRootFolder = getBookmarksBarId(this); |
Michael Kolb | 370a4f3 | 2010-10-06 10:45:32 -0700 | [diff] [blame] | 560 | if (mCurrentFolder == DEFAULT_FOLDER_ID) { |
Leon Scroggins | 0208194 | 2010-11-01 17:52:42 -0400 | [diff] [blame] | 561 | mCurrentFolder = mRootFolder; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 562 | } |
| 563 | |
| 564 | mTitle = (EditText) findViewById(R.id.title); |
| 565 | mTitle.setText(title); |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 566 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 567 | mAddress = (EditText) findViewById(R.id.address); |
| 568 | mAddress.setText(url); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 569 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 570 | mButton = (TextView) findViewById(R.id.OK); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 571 | mButton.setOnClickListener(this); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 572 | |
| 573 | mCancelButton = findViewById(R.id.cancel); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 574 | mCancelButton.setOnClickListener(this); |
| 575 | |
| 576 | mFolder = (TextView) findViewById(R.id.folder); |
| 577 | mFolder.setOnClickListener(this); |
| 578 | |
| 579 | mDefaultView = findViewById(R.id.default_view); |
| 580 | mFolderSelector = findViewById(R.id.folder_selector); |
| 581 | |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 582 | mFolderNamerHolder = getLayoutInflater().inflate(R.layout.new_folder_layout, null); |
| 583 | mFolderNamer = (EditText) mFolderNamerHolder.findViewById(R.id.folder_namer); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 584 | mFolderNamer.setOnEditorActionListener(this); |
| 585 | |
| 586 | mAddNewFolder = findViewById(R.id.add_new_folder); |
| 587 | mAddNewFolder.setOnClickListener(this); |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 588 | mAddSeparator = findViewById(R.id.add_divider); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 589 | |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 590 | mCrumbs = (BreadCrumbView) findViewById(R.id.crumbs); |
| 591 | mCrumbs.setUseBackButton(true); |
| 592 | mCrumbs.setController(this); |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 593 | String name = getString(R.string.bookmarks); |
Leon Scroggins | 905250c | 2010-12-17 15:25:33 -0500 | [diff] [blame] | 594 | mTopLevelLabel = (TextView) mCrumbs.pushView(name, false, new Folder(name, mRootFolder)); |
| 595 | // To better match the other folders. |
| 596 | mTopLevelLabel.setCompoundDrawablePadding(6); |
| 597 | mHeaderIcon = getResources().getDrawable(R.drawable.ic_folder_bookmark_widget_holo_dark); |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 598 | mCrumbHolder = findViewById(R.id.crumb_holder); |
John Reck | 89f73c1 | 2010-12-01 10:10:14 -0800 | [diff] [blame] | 599 | mCrumbs.setMaxVisible(MAX_CRUMBS_SHOWN); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 600 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 601 | mAdapter = new FolderAdapter(this); |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 602 | mListView = (CustomListView) findViewById(R.id.list); |
Leon Scroggins | 6573f9e | 2010-10-18 17:22:35 -0400 | [diff] [blame] | 603 | View empty = findViewById(R.id.empty); |
| 604 | mListView.setEmptyView(empty); |
| 605 | mListView.setAdapter(mAdapter); |
| 606 | mListView.setOnItemClickListener(this); |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 607 | mListView.addEditText(mFolderNamer); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 608 | LoaderManager manager = getLoaderManager(); |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 609 | if (mCurrentFolder != mRootFolder) { |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 610 | // Find all the folders |
| 611 | manager.initLoader(LOADER_ID_ALL_FOLDERS, null, this); |
Leon Scroggins | 905250c | 2010-12-17 15:25:33 -0500 | [diff] [blame] | 612 | } else { |
| 613 | setShowBookmarkIcon(true); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 614 | } |
Leon Scroggins | 52f7daa | 2010-10-18 16:57:46 -0400 | [diff] [blame] | 615 | // Find the contents of the current folder |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 616 | manager.initLoader(LOADER_ID_FOLDER_CONTENTS, null, this); |
| 617 | |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 618 | |
Leon Scroggins III | 76a0e9c | 2010-10-05 16:10:01 -0400 | [diff] [blame] | 619 | if (!window.getDecorView().isInTouchMode()) { |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 620 | mButton.requestFocus(); |
| 621 | } |
| 622 | } |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 623 | |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 624 | /** |
| 625 | * Get the account name and type of the currently synced account. |
| 626 | * @param context Context to access preferences. |
| 627 | * @return null if no account name or type. Otherwise, the result will be |
| 628 | * an array of two Strings, the accountName and accountType, respectively. |
| 629 | */ |
| 630 | private String[] getAccountNameAndType(Context context) { |
| 631 | SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); |
| 632 | String accountName = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_NAME, null); |
| 633 | String accountType = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, null); |
| 634 | if (TextUtils.isEmpty(accountName) || TextUtils.isEmpty(accountType)) { |
| 635 | return null; |
| 636 | } |
| 637 | return new String[] { accountName, accountType }; |
| 638 | } |
| 639 | |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 640 | // FIXME: Use a CursorLoader |
| 641 | private long getBookmarksBarId(Context context) { |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 642 | String[] accountInfo = getAccountNameAndType(context); |
| 643 | if (accountInfo == null) { |
Jeff Hamilton | a9bad83 | 2010-09-24 11:05:30 -0500 | [diff] [blame] | 644 | return BrowserProvider2.FIXED_ID_ROOT; |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 645 | } |
| 646 | Cursor cursor = null; |
| 647 | try { |
| 648 | cursor = context.getContentResolver().query( |
| 649 | BrowserContract.Bookmarks.CONTENT_URI, |
| 650 | new String[] { BrowserContract.Bookmarks._ID }, |
| 651 | BrowserContract.ChromeSyncColumns.SERVER_UNIQUE + "=? AND " |
| 652 | + BrowserContract.Bookmarks.ACCOUNT_NAME + "=? AND " |
| 653 | + BrowserContract.Bookmarks.ACCOUNT_TYPE + "=?", |
| 654 | new String[] { |
| 655 | BrowserContract.ChromeSyncColumns |
| 656 | .FOLDER_NAME_BOOKMARKS_BAR, |
Leon Scroggins | 8baaa63 | 2010-12-08 19:46:53 -0500 | [diff] [blame] | 657 | accountInfo[0], |
| 658 | accountInfo[1] }, |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 659 | null); |
| 660 | if (cursor != null && cursor.moveToFirst()) { |
| 661 | return cursor.getLong(0); |
| 662 | } |
| 663 | } finally { |
| 664 | if (cursor != null) cursor.close(); |
| 665 | } |
Jeff Hamilton | a9bad83 | 2010-09-24 11:05:30 -0500 | [diff] [blame] | 666 | return BrowserProvider2.FIXED_ID_ROOT; |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 667 | } |
| 668 | |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 669 | /** |
| 670 | * Runnable to save a bookmark, so it can be performed in its own thread. |
| 671 | */ |
| 672 | private class SaveBookmarkRunnable implements Runnable { |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 673 | // FIXME: This should be an async task. |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 674 | private Message mMessage; |
Henrik Baard | 980e995 | 2010-09-06 18:13:23 +0200 | [diff] [blame] | 675 | private Context mContext; |
| 676 | public SaveBookmarkRunnable(Context ctx, Message msg) { |
| 677 | mContext = ctx; |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 678 | mMessage = msg; |
| 679 | } |
| 680 | public void run() { |
| 681 | // Unbundle bookmark data. |
| 682 | Bundle bundle = mMessage.getData(); |
Leon Scroggins | bc92285 | 2010-10-22 12:15:27 -0400 | [diff] [blame] | 683 | String title = bundle.getString(BrowserContract.Bookmarks.TITLE); |
| 684 | String url = bundle.getString(BrowserContract.Bookmarks.URL); |
| 685 | boolean invalidateThumbnail = bundle.getBoolean(REMOVE_THUMBNAIL); |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 686 | Bitmap thumbnail = invalidateThumbnail ? null |
Leon Scroggins | bc92285 | 2010-10-22 12:15:27 -0400 | [diff] [blame] | 687 | : (Bitmap) bundle.getParcelable(BrowserContract.Bookmarks.THUMBNAIL); |
| 688 | String touchIconUrl = bundle.getString(TOUCH_ICON_URL); |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 689 | |
| 690 | // Save to the bookmarks DB. |
| 691 | try { |
| 692 | final ContentResolver cr = getContentResolver(); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 693 | Bookmarks.addBookmark(AddBookmarkPage.this, false, url, |
| 694 | title, thumbnail, true, mCurrentFolder); |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 695 | if (touchIconUrl != null) { |
Henrik Baard | 980e995 | 2010-09-06 18:13:23 +0200 | [diff] [blame] | 696 | new DownloadTouchIcon(mContext, cr, url).execute(mTouchIconUrl); |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 697 | } |
| 698 | mMessage.arg1 = 1; |
| 699 | } catch (IllegalStateException e) { |
| 700 | mMessage.arg1 = 0; |
| 701 | } |
| 702 | mMessage.sendToTarget(); |
| 703 | } |
| 704 | } |
| 705 | |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 706 | private static class UpdateBookmarkTask extends AsyncTask<ContentValues, Void, Void> { |
| 707 | Context mContext; |
| 708 | Long mId; |
| 709 | |
| 710 | public UpdateBookmarkTask(Context context, long id) { |
| 711 | mContext = context; |
| 712 | mId = id; |
| 713 | } |
| 714 | |
| 715 | @Override |
| 716 | protected Void doInBackground(ContentValues... params) { |
| 717 | if (params.length != 1) { |
| 718 | throw new IllegalArgumentException("No ContentValues provided!"); |
| 719 | } |
| 720 | Uri uri = ContentUris.withAppendedId(BookmarkUtils.getBookmarksUri(mContext), mId); |
| 721 | mContext.getContentResolver().update( |
| 722 | uri, |
| 723 | params[0], null, null); |
| 724 | return null; |
| 725 | } |
| 726 | } |
| 727 | |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 728 | private void createHandler() { |
| 729 | if (mHandler == null) { |
| 730 | mHandler = new Handler() { |
| 731 | @Override |
| 732 | public void handleMessage(Message msg) { |
| 733 | switch (msg.what) { |
| 734 | case SAVE_BOOKMARK: |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 735 | if (1 == msg.arg1) { |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 736 | Toast.makeText(AddBookmarkPage.this, R.string.bookmark_saved, |
| 737 | Toast.LENGTH_LONG).show(); |
| 738 | } else { |
| 739 | Toast.makeText(AddBookmarkPage.this, R.string.bookmark_not_saved, |
| 740 | Toast.LENGTH_LONG).show(); |
| 741 | } |
| 742 | break; |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 743 | case TOUCH_ICON_DOWNLOADED: |
| 744 | Bundle b = msg.getData(); |
| 745 | sendBroadcast(BookmarkUtils.createAddToHomeIntent( |
Leon Scroggins | bc92285 | 2010-10-22 12:15:27 -0400 | [diff] [blame] | 746 | AddBookmarkPage.this, |
| 747 | b.getString(BrowserContract.Bookmarks.URL), |
| 748 | b.getString(BrowserContract.Bookmarks.TITLE), |
| 749 | (Bitmap) b.getParcelable(BrowserContract.Bookmarks.TOUCH_ICON), |
| 750 | (Bitmap) b.getParcelable(BrowserContract.Bookmarks.FAVICON))); |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 751 | break; |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 752 | } |
| 753 | } |
| 754 | }; |
| 755 | } |
| 756 | } |
| 757 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 758 | /** |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 759 | * Parse the data entered in the dialog and post a message to update the bookmarks database. |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 760 | */ |
| 761 | boolean save() { |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 762 | createHandler(); |
| 763 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 764 | String title = mTitle.getText().toString().trim(); |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 765 | String unfilteredUrl; |
Michael Kolb | 8233fac | 2010-10-26 16:08:53 -0700 | [diff] [blame] | 766 | unfilteredUrl = UrlUtils.fixUrl(mAddress.getText().toString()); |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 767 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 768 | boolean emptyTitle = title.length() == 0; |
| 769 | boolean emptyUrl = unfilteredUrl.trim().length() == 0; |
| 770 | Resources r = getResources(); |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 771 | if (emptyTitle || (emptyUrl && !mEditingFolder)) { |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 772 | if (emptyTitle) { |
| 773 | mTitle.setError(r.getText(R.string.bookmark_needs_title)); |
| 774 | } |
| 775 | if (emptyUrl) { |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 776 | mAddress.setError(r.getText(R.string.bookmark_needs_url)); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 777 | } |
Leon Scroggins III | 6e3faea | 2010-09-07 15:22:14 -0400 | [diff] [blame] | 778 | return false; |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 779 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 780 | } |
Ben Murdoch | ca12cfa | 2009-11-17 13:57:44 +0000 | [diff] [blame] | 781 | String url = unfilteredUrl.trim(); |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 782 | if (!mEditingFolder) { |
| 783 | try { |
| 784 | // We allow bookmarks with a javascript: scheme, but these will in most cases |
| 785 | // fail URI parsing, so don't try it if that's the kind of bookmark we have. |
Ben Murdoch | ca12cfa | 2009-11-17 13:57:44 +0000 | [diff] [blame] | 786 | |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 787 | if (!url.toLowerCase().startsWith("javascript:")) { |
| 788 | URI uriObj = new URI(url); |
| 789 | String scheme = uriObj.getScheme(); |
| 790 | if (!Bookmarks.urlHasAcceptableScheme(url)) { |
| 791 | // If the scheme was non-null, let the user know that we |
| 792 | // can't save their bookmark. If it was null, we'll assume |
| 793 | // they meant http when we parse it in the WebAddress class. |
| 794 | if (scheme != null) { |
| 795 | mAddress.setError(r.getText(R.string.bookmark_cannot_save_url)); |
| 796 | return false; |
| 797 | } |
| 798 | WebAddress address; |
| 799 | try { |
| 800 | address = new WebAddress(unfilteredUrl); |
| 801 | } catch (ParseException e) { |
| 802 | throw new URISyntaxException("", ""); |
| 803 | } |
| 804 | if (address.getHost().length() == 0) { |
| 805 | throw new URISyntaxException("", ""); |
| 806 | } |
| 807 | url = address.toString(); |
Ben Murdoch | ca12cfa | 2009-11-17 13:57:44 +0000 | [diff] [blame] | 808 | } |
Ben Murdoch | de35362 | 2009-10-12 10:29:00 +0100 | [diff] [blame] | 809 | } |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 810 | } catch (URISyntaxException e) { |
| 811 | mAddress.setError(r.getText(R.string.bookmark_url_not_valid)); |
| 812 | return false; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 813 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 814 | } |
Ben Murdoch | aac7aa6 | 2009-09-17 16:57:40 +0100 | [diff] [blame] | 815 | |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 816 | if (mSaveToHomeScreen) { |
| 817 | mEditingExisting = false; |
| 818 | } |
| 819 | |
| 820 | boolean urlUnmodified = url.equals(mOriginalUrl); |
| 821 | |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 822 | if (mEditingExisting) { |
John Reck | c849081 | 2010-11-22 14:15:36 -0800 | [diff] [blame] | 823 | Long id = mMap.getLong(BrowserContract.Bookmarks._ID); |
| 824 | ContentValues values = new ContentValues(); |
| 825 | values.put(BrowserContract.Bookmarks.TITLE, title); |
| 826 | values.put(BrowserContract.Bookmarks.PARENT, mCurrentFolder); |
| 827 | if (!mEditingFolder) { |
| 828 | values.put(BrowserContract.Bookmarks.URL, url); |
| 829 | if (!urlUnmodified) { |
| 830 | values.putNull(BrowserContract.Bookmarks.THUMBNAIL); |
| 831 | } |
| 832 | } |
| 833 | if (values.size() > 0) { |
| 834 | new UpdateBookmarkTask(getApplicationContext(), id).execute(values); |
| 835 | } |
| 836 | setResult(RESULT_OK); |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 837 | } else { |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 838 | Bitmap thumbnail; |
| 839 | Bitmap favicon; |
| 840 | if (urlUnmodified) { |
Leon Scroggins | bc92285 | 2010-10-22 12:15:27 -0400 | [diff] [blame] | 841 | thumbnail = (Bitmap) mMap.getParcelable( |
| 842 | BrowserContract.Bookmarks.THUMBNAIL); |
| 843 | favicon = (Bitmap) mMap.getParcelable( |
| 844 | BrowserContract.Bookmarks.FAVICON); |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 845 | } else { |
| 846 | thumbnail = null; |
| 847 | favicon = null; |
| 848 | } |
| 849 | |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 850 | Bundle bundle = new Bundle(); |
Leon Scroggins | bc92285 | 2010-10-22 12:15:27 -0400 | [diff] [blame] | 851 | bundle.putString(BrowserContract.Bookmarks.TITLE, title); |
| 852 | bundle.putString(BrowserContract.Bookmarks.URL, url); |
| 853 | bundle.putParcelable(BrowserContract.Bookmarks.FAVICON, favicon); |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 854 | |
| 855 | if (mSaveToHomeScreen) { |
| 856 | if (mTouchIconUrl != null && urlUnmodified) { |
| 857 | Message msg = Message.obtain(mHandler, |
| 858 | TOUCH_ICON_DOWNLOADED); |
| 859 | msg.setData(bundle); |
| 860 | DownloadTouchIcon icon = new DownloadTouchIcon(this, msg, |
Leon Scroggins | bc92285 | 2010-10-22 12:15:27 -0400 | [diff] [blame] | 861 | mMap.getString(USER_AGENT)); |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 862 | icon.execute(mTouchIconUrl); |
| 863 | } else { |
| 864 | sendBroadcast(BookmarkUtils.createAddToHomeIntent(this, url, |
| 865 | title, null /*touchIcon*/, favicon)); |
| 866 | } |
| 867 | } else { |
Leon Scroggins | bc92285 | 2010-10-22 12:15:27 -0400 | [diff] [blame] | 868 | bundle.putParcelable(BrowserContract.Bookmarks.THUMBNAIL, thumbnail); |
| 869 | bundle.putBoolean(REMOVE_THUMBNAIL, !urlUnmodified); |
| 870 | bundle.putString(TOUCH_ICON_URL, mTouchIconUrl); |
Leon Scroggins | 88d0803 | 2010-10-21 15:17:10 -0400 | [diff] [blame] | 871 | // Post a message to write to the DB. |
| 872 | Message msg = Message.obtain(mHandler, SAVE_BOOKMARK); |
| 873 | msg.setData(bundle); |
| 874 | // Start a new thread so as to not slow down the UI |
| 875 | Thread t = new Thread(new SaveBookmarkRunnable(getApplicationContext(), msg)); |
| 876 | t.start(); |
| 877 | } |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 878 | setResult(RESULT_OK); |
Kristian Monsen | 0a1d838 | 2010-02-01 18:41:07 +0000 | [diff] [blame] | 879 | LogTag.logBookmarkAdded(url, "bookmarkview"); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 880 | } |
| 881 | return true; |
| 882 | } |
Leon Scroggins | 162f835 | 2010-10-18 15:02:44 -0400 | [diff] [blame] | 883 | |
| 884 | /* |
| 885 | * Class used as a proxy for the InputMethodManager to get to mFolderNamer |
| 886 | */ |
| 887 | public static class CustomListView extends ListView { |
| 888 | private EditText mEditText; |
| 889 | |
| 890 | public void addEditText(EditText editText) { |
| 891 | mEditText = editText; |
| 892 | } |
| 893 | |
| 894 | public CustomListView(Context context) { |
| 895 | super(context); |
| 896 | } |
| 897 | |
| 898 | public CustomListView(Context context, AttributeSet attrs) { |
| 899 | super(context, attrs); |
| 900 | } |
| 901 | |
| 902 | public CustomListView(Context context, AttributeSet attrs, int defStyle) { |
| 903 | super(context, attrs, defStyle); |
| 904 | } |
| 905 | |
| 906 | @Override |
| 907 | public boolean checkInputConnectionProxy(View view) { |
| 908 | return view == mEditText; |
| 909 | } |
| 910 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 911 | } |