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; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 28 | import android.content.Intent; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 29 | import android.content.Loader; |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 30 | import android.content.SharedPreferences; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 31 | import android.content.res.Resources; |
Patrick Scott | 3918d44 | 2009-08-04 13:22:29 -0400 | [diff] [blame] | 32 | import android.database.Cursor; |
Ben Murdoch | aac7aa6 | 2009-09-17 16:57:40 +0100 | [diff] [blame] | 33 | import android.graphics.Bitmap; |
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; |
| 37 | import android.os.Bundle; |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 38 | import android.os.Handler; |
| 39 | import android.os.Message; |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 40 | import android.preference.PreferenceManager; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 41 | import android.provider.BrowserContract; |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 42 | import android.text.TextUtils; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 43 | import android.view.KeyEvent; |
| 44 | import android.view.LayoutInflater; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 45 | import android.view.View; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 46 | import android.view.ViewGroup; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 47 | import android.view.Window; |
Leon Scroggins III | 76a0e9c | 2010-10-05 16:10:01 -0400 | [diff] [blame] | 48 | import android.view.WindowManager; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 49 | import android.view.inputmethod.EditorInfo; |
| 50 | import android.view.inputmethod.InputMethodManager; |
| 51 | import android.widget.AdapterView; |
| 52 | import android.widget.CursorAdapter; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 53 | import android.widget.EditText; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 54 | import android.widget.ListView; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 55 | import android.widget.TextView; |
| 56 | import android.widget.Toast; |
| 57 | |
Cary Clark | f2407c6 | 2009-09-04 12:25:10 -0400 | [diff] [blame] | 58 | import java.net.URI; |
| 59 | import java.net.URISyntaxException; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 60 | import java.util.ArrayList; |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 61 | import java.util.Stack; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 62 | |
| 63 | public class AddBookmarkPage extends Activity |
| 64 | implements View.OnClickListener, TextView.OnEditorActionListener, |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 65 | AdapterView.OnItemClickListener, LoaderManager.LoaderCallbacks<Cursor>, |
| 66 | BreadCrumbView.Controller { |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 67 | |
Michael Kolb | 370a4f3 | 2010-10-06 10:45:32 -0700 | [diff] [blame] | 68 | public static final long DEFAULT_FOLDER_ID = -1; |
| 69 | |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 70 | private static final int MAX_CRUMBS_SHOWN = 2; |
| 71 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 72 | private final String LOGTAG = "Bookmarks"; |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 73 | // Set to true to see the crash on the code I would like to run. |
| 74 | private final boolean DEBUG_CRASH = false; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 75 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 76 | // IDs for the CursorLoaders that are used. |
| 77 | private final int LOADER_ID_FOLDER_CONTENTS = 0; |
| 78 | private final int LOADER_ID_ALL_FOLDERS = 1; |
| 79 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 80 | private EditText mTitle; |
| 81 | private EditText mAddress; |
| 82 | private TextView mButton; |
| 83 | private View mCancelButton; |
| 84 | private boolean mEditingExisting; |
| 85 | private Bundle mMap; |
Patrick Scott | 3918d44 | 2009-08-04 13:22:29 -0400 | [diff] [blame] | 86 | private String mTouchIconUrl; |
Ben Murdoch | aac7aa6 | 2009-09-17 16:57:40 +0100 | [diff] [blame] | 87 | private Bitmap mThumbnail; |
| 88 | private String mOriginalUrl; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 89 | private TextView mFolder; |
| 90 | private View mDefaultView; |
| 91 | private View mFolderSelector; |
| 92 | private EditText mFolderNamer; |
| 93 | private View mAddNewFolder; |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 94 | private View mAddSeparator; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 95 | private long mCurrentFolder = 0; |
| 96 | private FolderAdapter mAdapter; |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 97 | private BreadCrumbView mCrumbs; |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 98 | private TextView mFakeTitle; |
| 99 | private View mCrumbHolder; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 100 | |
| 101 | private static class Folder { |
| 102 | String Name; |
| 103 | long Id; |
| 104 | Folder(String name, long id) { |
| 105 | Name = name; |
| 106 | Id = id; |
| 107 | } |
| 108 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 109 | |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 110 | // Message IDs |
| 111 | private static final int SAVE_BOOKMARK = 100; |
| 112 | |
| 113 | private Handler mHandler; |
| 114 | |
Bjorn Bringert | b1402a5 | 2010-10-12 10:53:12 +0100 | [diff] [blame] | 115 | private InputMethodManager getInputMethodManager() { |
| 116 | return (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE); |
| 117 | } |
| 118 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 119 | @Override |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 120 | public void onTop(int level, Object data) { |
| 121 | if (null == data) return; |
| 122 | mCurrentFolder = (Long) data; |
| 123 | Uri uri = BrowserContract.Bookmarks.buildFolderUri(mCurrentFolder); |
| 124 | LoaderManager manager = getLoaderManager(); |
| 125 | CursorLoader loader = (CursorLoader) ((Loader) manager.getLoader( |
| 126 | LOADER_ID_FOLDER_CONTENTS)); |
| 127 | loader.setUri(uri); |
| 128 | loader.forceLoad(); |
| 129 | updateVisible(); |
| 130 | } |
| 131 | |
| 132 | /** |
| 133 | * Update the views shown to only show the two deepest levels of crumbs. |
| 134 | * Note that this method depends on internal knowledge of BreadCrumbView. |
| 135 | */ |
| 136 | private void updateVisible() { |
| 137 | if (MAX_CRUMBS_SHOWN > 0) { |
| 138 | int invisibleCrumbs = mCrumbs.size() - MAX_CRUMBS_SHOWN; |
| 139 | // This class always uses a back button, which is the first child. |
| 140 | int childIndex = 1; |
| 141 | if (invisibleCrumbs > 0) { |
| 142 | int crumbIndex = 0; |
| 143 | while (crumbIndex < invisibleCrumbs) { |
| 144 | // Set the crumb to GONE. |
| 145 | mCrumbs.getChildAt(childIndex).setVisibility(View.GONE); |
| 146 | childIndex++; |
| 147 | // Each crumb is followed by a separator (except the last |
| 148 | // one). Also make it GONE |
| 149 | mCrumbs.getChildAt(childIndex).setVisibility(View.GONE); |
| 150 | childIndex++; |
| 151 | // Move to the next crumb. |
| 152 | crumbIndex++; |
| 153 | } |
| 154 | } |
| 155 | // Make sure the last two are visible. |
| 156 | int childCount = mCrumbs.getChildCount(); |
| 157 | while (childIndex < childCount) { |
| 158 | mCrumbs.getChildAt(childIndex).setVisibility(View.VISIBLE); |
| 159 | childIndex++; |
| 160 | } |
| 161 | } |
| 162 | } |
| 163 | |
| 164 | @Override |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 165 | public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { |
| 166 | if (v == mFolderNamer) { |
| 167 | if (v.getText().length() > 0) { |
| 168 | if (actionId == EditorInfo.IME_NULL) { |
| 169 | // Only want to do this once. |
| 170 | if (event.getAction() == KeyEvent.ACTION_UP) { |
Michael Kolb | 31829b9 | 2010-10-01 11:50:21 -0700 | [diff] [blame] | 171 | completeFolderNaming(); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 172 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 173 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 174 | } |
Michael Kolb | 31829b9 | 2010-10-01 11:50:21 -0700 | [diff] [blame] | 175 | // Steal the key press; otherwise a newline will be added |
| 176 | return true; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 177 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 178 | return false; |
| 179 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 180 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 181 | @Override |
| 182 | public void onClick(View v) { |
| 183 | if (v == mButton) { |
| 184 | if (mFolderSelector.getVisibility() == View.VISIBLE) { |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 185 | // We are showing the folder selector. |
| 186 | if (mFolderNamer.getVisibility() == View.VISIBLE) { |
Michael Kolb | 31829b9 | 2010-10-01 11:50:21 -0700 | [diff] [blame] | 187 | completeFolderNaming(); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 188 | } else { |
| 189 | // User has selected a folder. Go back to the opening page |
| 190 | mFolderSelector.setVisibility(View.GONE); |
| 191 | mDefaultView.setVisibility(View.VISIBLE); |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 192 | mCrumbHolder.setVisibility(View.GONE); |
| 193 | mFakeTitle.setVisibility(View.VISIBLE); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 194 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 195 | } else if (save()) { |
| 196 | finish(); |
| 197 | } |
| 198 | } else if (v == mCancelButton) { |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 199 | if (mFolderNamer.getVisibility() == View.VISIBLE) { |
| 200 | mFolderNamer.setVisibility(View.GONE); |
| 201 | mAddNewFolder.setVisibility(View.VISIBLE); |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 202 | mAddSeparator.setVisibility(View.VISIBLE); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 203 | } else { |
| 204 | finish(); |
| 205 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 206 | } else if (v == mFolder) { |
| 207 | switchToFolderSelector(); |
| 208 | } else if (v == mAddNewFolder) { |
| 209 | mFolderNamer.setVisibility(View.VISIBLE); |
| 210 | mFolderNamer.setText(R.string.new_folder); |
| 211 | mFolderNamer.requestFocus(); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 212 | mAddNewFolder.setVisibility(View.GONE); |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 213 | mAddSeparator.setVisibility(View.GONE); |
Bjorn Bringert | b1402a5 | 2010-10-12 10:53:12 +0100 | [diff] [blame] | 214 | getInputMethodManager().showSoftInput(mFolderNamer, |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 215 | InputMethodManager.SHOW_IMPLICIT); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 216 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 217 | } |
| 218 | |
Michael Kolb | 31829b9 | 2010-10-01 11:50:21 -0700 | [diff] [blame] | 219 | private void completeFolderNaming() { |
| 220 | if (!TextUtils.isEmpty(mFolderNamer.getText())) { |
| 221 | String name = mFolderNamer.getText().toString(); |
| 222 | long id = addFolderToCurrent(mFolderNamer.getText().toString()); |
| 223 | descendInto(name, id); |
| 224 | mFolderNamer.setVisibility(View.GONE); |
| 225 | mAddNewFolder.setVisibility(View.VISIBLE); |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 226 | mAddSeparator.setVisibility(View.VISIBLE); |
Bjorn Bringert | b1402a5 | 2010-10-12 10:53:12 +0100 | [diff] [blame] | 227 | getInputMethodManager().hideSoftInputFromWindow( |
Michael Kolb | 31829b9 | 2010-10-01 11:50:21 -0700 | [diff] [blame] | 228 | mFolderNamer.getWindowToken(), 0); |
| 229 | } |
| 230 | } |
| 231 | |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 232 | private long addFolderToCurrent(String name) { |
| 233 | // Add the folder to the database |
| 234 | ContentValues values = new ContentValues(); |
| 235 | values.put(BrowserContract.Bookmarks.TITLE, |
| 236 | name); |
| 237 | values.put(BrowserContract.Bookmarks.IS_FOLDER, 1); |
| 238 | values.put(BrowserContract.Bookmarks.PARENT, |
| 239 | mCurrentFolder); |
| 240 | Uri uri = getContentResolver().insert( |
| 241 | BrowserContract.Bookmarks.CONTENT_URI, values); |
| 242 | if (uri != null) { |
| 243 | return ContentUris.parseId(uri); |
| 244 | } else { |
| 245 | return -1; |
| 246 | } |
| 247 | } |
| 248 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 249 | private void switchToFolderSelector() { |
| 250 | mDefaultView.setVisibility(View.GONE); |
| 251 | mFolderSelector.setVisibility(View.VISIBLE); |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 252 | mCrumbHolder.setVisibility(View.VISIBLE); |
| 253 | mFakeTitle.setVisibility(View.GONE); |
| 254 | mAddNewFolder.setVisibility(View.VISIBLE); |
| 255 | mAddSeparator.setVisibility(View.VISIBLE); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 256 | } |
| 257 | |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 258 | private void descendInto(String foldername, long id) { |
Michael Kolb | 370a4f3 | 2010-10-06 10:45:32 -0700 | [diff] [blame] | 259 | if (id != DEFAULT_FOLDER_ID) { |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 260 | mCurrentFolder = id; |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 261 | mCrumbs.pushView(foldername, id); |
| 262 | mCrumbs.notifyController(); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 263 | } |
| 264 | } |
| 265 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 266 | @Override |
| 267 | public Loader<Cursor> onCreateLoader(int id, Bundle args) { |
| 268 | String[] projection; |
| 269 | switch (id) { |
| 270 | case LOADER_ID_ALL_FOLDERS: |
| 271 | projection = new String[] { |
| 272 | BrowserContract.Bookmarks._ID, |
| 273 | BrowserContract.Bookmarks.PARENT, |
| 274 | BrowserContract.Bookmarks.TITLE, |
| 275 | BrowserContract.Bookmarks.IS_FOLDER |
| 276 | }; |
| 277 | return new CursorLoader(this, |
| 278 | BrowserContract.Bookmarks.CONTENT_URI, |
| 279 | projection, |
| 280 | BrowserContract.Bookmarks.IS_FOLDER + " != 0", |
| 281 | null, |
| 282 | null); |
| 283 | case LOADER_ID_FOLDER_CONTENTS: |
| 284 | projection = new String[] { |
| 285 | BrowserContract.Bookmarks._ID, |
| 286 | BrowserContract.Bookmarks.TITLE, |
| 287 | BrowserContract.Bookmarks.IS_FOLDER |
| 288 | }; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 289 | return new CursorLoader(this, |
| 290 | BrowserContract.Bookmarks.buildFolderUri( |
| 291 | mCurrentFolder), |
| 292 | projection, |
| 293 | BrowserContract.Bookmarks.IS_FOLDER + " != 0", |
| 294 | null, |
| 295 | null); |
| 296 | default: |
| 297 | throw new AssertionError("Asking for nonexistant loader!"); |
| 298 | } |
| 299 | } |
| 300 | |
| 301 | @Override |
| 302 | public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) { |
| 303 | switch (loader.getId()) { |
| 304 | case LOADER_ID_FOLDER_CONTENTS: |
| 305 | mAdapter.changeCursor(cursor); |
| 306 | break; |
| 307 | case LOADER_ID_ALL_FOLDERS: |
| 308 | long parent = mCurrentFolder; |
| 309 | int idIndex = cursor.getColumnIndexOrThrow( |
| 310 | BrowserContract.Bookmarks._ID); |
| 311 | int titleIndex = cursor.getColumnIndexOrThrow( |
| 312 | BrowserContract.Bookmarks.TITLE); |
| 313 | int parentIndex = cursor.getColumnIndexOrThrow( |
| 314 | BrowserContract.Bookmarks.PARENT); |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 315 | Stack folderStack = new Stack(); |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 316 | while ((parent != BrowserProvider2.FIXED_ID_ROOT) && |
| 317 | (parent != 0)) { |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 318 | // First, find the folder corresponding to the current |
| 319 | // folder |
| 320 | if (!cursor.moveToFirst()) { |
| 321 | throw new AssertionError("No folders in the database!"); |
| 322 | } |
| 323 | long folder; |
| 324 | do { |
| 325 | folder = cursor.getLong(idIndex); |
| 326 | } while (folder != parent && cursor.moveToNext()); |
| 327 | if (cursor.isAfterLast()) { |
| 328 | throw new AssertionError("Folder(id=" + parent |
| 329 | + ") holding this bookmark does not exist!"); |
| 330 | } |
| 331 | String name = cursor.getString(titleIndex); |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 332 | folderStack.push(new Folder(name, parent)); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 333 | parent = cursor.getLong(parentIndex); |
| 334 | } |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 335 | while (!folderStack.isEmpty()) { |
| 336 | Folder thisFolder = (Folder) folderStack.pop(); |
| 337 | mCrumbs.pushView(thisFolder.Name, thisFolder.Id); |
| 338 | } |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 339 | getLoaderManager().stopLoader(LOADER_ID_ALL_FOLDERS); |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 340 | updateVisible(); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 341 | break; |
| 342 | default: |
| 343 | break; |
| 344 | } |
| 345 | } |
| 346 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 347 | @Override |
| 348 | public void onItemClick(AdapterView<?> parent, View view, int position, |
| 349 | long id) { |
Leon Scroggins | d14cb12 | 2010-09-29 16:01:48 -0400 | [diff] [blame] | 350 | TextView tv = (TextView) view.findViewById(android.R.id.text1); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 351 | // Switch to the folder that was clicked on. |
Leon Scroggins | d14cb12 | 2010-09-29 16:01:48 -0400 | [diff] [blame] | 352 | descendInto(tv.getText().toString(), id); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 353 | } |
| 354 | |
| 355 | /** |
| 356 | * Shows a list of names of folders. |
| 357 | */ |
| 358 | private class FolderAdapter extends CursorAdapter { |
| 359 | public FolderAdapter(Context context) { |
| 360 | super(context, null); |
| 361 | } |
| 362 | |
| 363 | @Override |
| 364 | public void bindView(View view, Context context, Cursor cursor) { |
| 365 | ((TextView) view.findViewById(android.R.id.text1)).setText( |
| 366 | cursor.getString(cursor.getColumnIndexOrThrow( |
| 367 | BrowserContract.Bookmarks.TITLE))); |
| 368 | } |
| 369 | |
| 370 | @Override |
| 371 | public View newView(Context context, Cursor cursor, ViewGroup parent) { |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 372 | View view = LayoutInflater.from(context).inflate( |
| 373 | R.layout.folder_list_item, null); |
| 374 | view.setBackgroundDrawable(context.getResources(). |
| 375 | getDrawable(android.R.drawable.list_selector_background)); |
| 376 | return view; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 377 | } |
| 378 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 379 | |
| 380 | protected void onCreate(Bundle icicle) { |
| 381 | super.onCreate(icicle); |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 382 | if (DEBUG_CRASH) { |
| 383 | requestWindowFeature(Window.FEATURE_NO_TITLE); |
| 384 | } else { |
| 385 | requestWindowFeature(Window.FEATURE_LEFT_ICON); |
| 386 | } |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 387 | |
| 388 | mMap = getIntent().getExtras(); |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 389 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 390 | setContentView(R.layout.browser_add_bookmark); |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 391 | |
Leon Scroggins III | 76a0e9c | 2010-10-05 16:10:01 -0400 | [diff] [blame] | 392 | Window window = getWindow(); |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 393 | if (!DEBUG_CRASH) { |
| 394 | setTitle(R.string.bookmark_this_page); |
| 395 | window.setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, R.drawable.ic_list_bookmark); |
| 396 | } |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 397 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 398 | String title = null; |
| 399 | String url = null; |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 400 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 401 | if (mMap != null) { |
| 402 | Bundle b = mMap.getBundle("bookmark"); |
| 403 | if (b != null) { |
| 404 | mMap = b; |
| 405 | mEditingExisting = true; |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 406 | mFakeTitle.setText(R.string.edit_bookmark); |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 407 | if (!DEBUG_CRASH) { |
| 408 | setTitle(R.string.bookmark_this_page); |
| 409 | } |
Leon Scroggins III | 76a0e9c | 2010-10-05 16:10:01 -0400 | [diff] [blame] | 410 | } else { |
| 411 | int gravity = mMap.getInt("gravity", -1); |
| 412 | if (gravity != -1) { |
| 413 | WindowManager.LayoutParams l = window.getAttributes(); |
| 414 | l.gravity = gravity; |
| 415 | window.setAttributes(l); |
| 416 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 417 | } |
| 418 | title = mMap.getString("title"); |
Ben Murdoch | aac7aa6 | 2009-09-17 16:57:40 +0100 | [diff] [blame] | 419 | url = mOriginalUrl = mMap.getString("url"); |
Patrick Scott | 3918d44 | 2009-08-04 13:22:29 -0400 | [diff] [blame] | 420 | mTouchIconUrl = mMap.getString("touch_icon_url"); |
Ben Murdoch | aac7aa6 | 2009-09-17 16:57:40 +0100 | [diff] [blame] | 421 | mThumbnail = (Bitmap) mMap.getParcelable("thumbnail"); |
Michael Kolb | 370a4f3 | 2010-10-06 10:45:32 -0700 | [diff] [blame] | 422 | mCurrentFolder = mMap.getLong(BrowserContract.Bookmarks.PARENT, DEFAULT_FOLDER_ID); |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 423 | } |
Michael Kolb | 370a4f3 | 2010-10-06 10:45:32 -0700 | [diff] [blame] | 424 | if (mCurrentFolder == DEFAULT_FOLDER_ID) { |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 425 | mCurrentFolder = getBookmarksBarId(this); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 426 | } |
| 427 | |
| 428 | mTitle = (EditText) findViewById(R.id.title); |
| 429 | mTitle.setText(title); |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 430 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 431 | mAddress = (EditText) findViewById(R.id.address); |
| 432 | mAddress.setText(url); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 433 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 434 | mButton = (TextView) findViewById(R.id.OK); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 435 | mButton.setOnClickListener(this); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 436 | |
| 437 | mCancelButton = findViewById(R.id.cancel); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 438 | mCancelButton.setOnClickListener(this); |
| 439 | |
| 440 | mFolder = (TextView) findViewById(R.id.folder); |
| 441 | mFolder.setOnClickListener(this); |
| 442 | |
| 443 | mDefaultView = findViewById(R.id.default_view); |
| 444 | mFolderSelector = findViewById(R.id.folder_selector); |
| 445 | |
| 446 | mFolderNamer = (EditText) findViewById(R.id.folder_namer); |
| 447 | mFolderNamer.setOnEditorActionListener(this); |
| 448 | |
| 449 | mAddNewFolder = findViewById(R.id.add_new_folder); |
| 450 | mAddNewFolder.setOnClickListener(this); |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 451 | mAddSeparator = findViewById(R.id.add_divider); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 452 | |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 453 | mCrumbs = (BreadCrumbView) findViewById(R.id.crumbs); |
| 454 | mCrumbs.setUseBackButton(true); |
| 455 | mCrumbs.setController(this); |
| 456 | mCrumbs.pushView(getString(R.string.bookmarks), false, |
| 457 | BrowserProvider2.FIXED_ID_ROOT); |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 458 | mCrumbHolder = findViewById(R.id.crumb_holder); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 459 | |
Leon Scroggins | 7e5f735 | 2010-10-18 13:25:31 -0400 | [diff] [blame] | 460 | mFakeTitle = (TextView) findViewById(R.id.fake_title); |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 461 | |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 462 | mAdapter = new FolderAdapter(this); |
Leon Scroggins | 74dbe01 | 2010-10-15 10:54:27 -0400 | [diff] [blame] | 463 | ListView list = (ListView) findViewById(R.id.list); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 464 | list.setAdapter(mAdapter); |
| 465 | list.setOnItemClickListener(this); |
| 466 | LoaderManager manager = getLoaderManager(); |
Jeff Hamilton | a9bad83 | 2010-09-24 11:05:30 -0500 | [diff] [blame] | 467 | if (mCurrentFolder != BrowserProvider2.FIXED_ID_ROOT) { |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 468 | // Find all the folders |
| 469 | manager.initLoader(LOADER_ID_ALL_FOLDERS, null, this); |
| 470 | } |
| 471 | manager.initLoader(LOADER_ID_FOLDER_CONTENTS, null, this); |
| 472 | |
Michael Kolb | d40ac1a | 2010-09-29 00:23:46 -0700 | [diff] [blame] | 473 | |
Leon Scroggins III | 76a0e9c | 2010-10-05 16:10:01 -0400 | [diff] [blame] | 474 | if (!window.getDecorView().isInTouchMode()) { |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 475 | mButton.requestFocus(); |
| 476 | } |
| 477 | } |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 478 | |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 479 | // FIXME: Use a CursorLoader |
| 480 | private long getBookmarksBarId(Context context) { |
| 481 | SharedPreferences prefs |
| 482 | = PreferenceManager.getDefaultSharedPreferences(context); |
| 483 | String accountName = |
| 484 | prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_NAME, null); |
| 485 | String accountType = |
| 486 | prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, null); |
| 487 | if (TextUtils.isEmpty(accountName) || TextUtils.isEmpty(accountType)) { |
Jeff Hamilton | a9bad83 | 2010-09-24 11:05:30 -0500 | [diff] [blame] | 488 | return BrowserProvider2.FIXED_ID_ROOT; |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 489 | } |
| 490 | Cursor cursor = null; |
| 491 | try { |
| 492 | cursor = context.getContentResolver().query( |
| 493 | BrowserContract.Bookmarks.CONTENT_URI, |
| 494 | new String[] { BrowserContract.Bookmarks._ID }, |
| 495 | BrowserContract.ChromeSyncColumns.SERVER_UNIQUE + "=? AND " |
| 496 | + BrowserContract.Bookmarks.ACCOUNT_NAME + "=? AND " |
| 497 | + BrowserContract.Bookmarks.ACCOUNT_TYPE + "=?", |
| 498 | new String[] { |
| 499 | BrowserContract.ChromeSyncColumns |
| 500 | .FOLDER_NAME_BOOKMARKS_BAR, |
| 501 | accountName, |
| 502 | accountType }, |
| 503 | null); |
| 504 | if (cursor != null && cursor.moveToFirst()) { |
| 505 | return cursor.getLong(0); |
| 506 | } |
| 507 | } finally { |
| 508 | if (cursor != null) cursor.close(); |
| 509 | } |
Jeff Hamilton | a9bad83 | 2010-09-24 11:05:30 -0500 | [diff] [blame] | 510 | return BrowserProvider2.FIXED_ID_ROOT; |
Leon Scroggins | 25230d7 | 2010-09-28 20:09:25 -0400 | [diff] [blame] | 511 | } |
| 512 | |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 513 | /** |
| 514 | * Runnable to save a bookmark, so it can be performed in its own thread. |
| 515 | */ |
| 516 | private class SaveBookmarkRunnable implements Runnable { |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 517 | // FIXME: This should be an async task. |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 518 | private Message mMessage; |
Henrik Baard | 980e995 | 2010-09-06 18:13:23 +0200 | [diff] [blame] | 519 | private Context mContext; |
| 520 | public SaveBookmarkRunnable(Context ctx, Message msg) { |
| 521 | mContext = ctx; |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 522 | mMessage = msg; |
| 523 | } |
| 524 | public void run() { |
| 525 | // Unbundle bookmark data. |
| 526 | Bundle bundle = mMessage.getData(); |
| 527 | String title = bundle.getString("title"); |
| 528 | String url = bundle.getString("url"); |
| 529 | boolean invalidateThumbnail = bundle.getBoolean( |
| 530 | "invalidateThumbnail"); |
| 531 | Bitmap thumbnail = invalidateThumbnail ? null |
| 532 | : (Bitmap) bundle.getParcelable("thumbnail"); |
| 533 | String touchIconUrl = bundle.getString("touchIconUrl"); |
| 534 | |
| 535 | // Save to the bookmarks DB. |
| 536 | try { |
| 537 | final ContentResolver cr = getContentResolver(); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 538 | Bookmarks.addBookmark(AddBookmarkPage.this, false, url, |
| 539 | title, thumbnail, true, mCurrentFolder); |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 540 | if (touchIconUrl != null) { |
Henrik Baard | 980e995 | 2010-09-06 18:13:23 +0200 | [diff] [blame] | 541 | new DownloadTouchIcon(mContext, cr, url).execute(mTouchIconUrl); |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 542 | } |
| 543 | mMessage.arg1 = 1; |
| 544 | } catch (IllegalStateException e) { |
| 545 | mMessage.arg1 = 0; |
| 546 | } |
| 547 | mMessage.sendToTarget(); |
| 548 | } |
| 549 | } |
| 550 | |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 551 | private void createHandler() { |
| 552 | if (mHandler == null) { |
| 553 | mHandler = new Handler() { |
| 554 | @Override |
| 555 | public void handleMessage(Message msg) { |
| 556 | switch (msg.what) { |
| 557 | case SAVE_BOOKMARK: |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 558 | if (1 == msg.arg1) { |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 559 | Toast.makeText(AddBookmarkPage.this, R.string.bookmark_saved, |
| 560 | Toast.LENGTH_LONG).show(); |
| 561 | } else { |
| 562 | Toast.makeText(AddBookmarkPage.this, R.string.bookmark_not_saved, |
| 563 | Toast.LENGTH_LONG).show(); |
| 564 | } |
| 565 | break; |
| 566 | } |
| 567 | } |
| 568 | }; |
| 569 | } |
| 570 | } |
| 571 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 572 | /** |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 573 | * 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] | 574 | */ |
| 575 | boolean save() { |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 576 | createHandler(); |
| 577 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 578 | String title = mTitle.getText().toString().trim(); |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 579 | String unfilteredUrl; |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 580 | unfilteredUrl = BrowserActivity.fixUrl(mAddress.getText().toString()); |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 581 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 582 | boolean emptyTitle = title.length() == 0; |
| 583 | boolean emptyUrl = unfilteredUrl.trim().length() == 0; |
| 584 | Resources r = getResources(); |
| 585 | if (emptyTitle || emptyUrl) { |
| 586 | if (emptyTitle) { |
| 587 | mTitle.setError(r.getText(R.string.bookmark_needs_title)); |
| 588 | } |
| 589 | if (emptyUrl) { |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 590 | mAddress.setError(r.getText(R.string.bookmark_needs_url)); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 591 | } |
Leon Scroggins III | 6e3faea | 2010-09-07 15:22:14 -0400 | [diff] [blame] | 592 | return false; |
Ben Murdoch | eecb4e6 | 2010-07-06 16:30:38 +0100 | [diff] [blame] | 593 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 594 | } |
Ben Murdoch | ca12cfa | 2009-11-17 13:57:44 +0000 | [diff] [blame] | 595 | String url = unfilteredUrl.trim(); |
Cary Clark | f2407c6 | 2009-09-04 12:25:10 -0400 | [diff] [blame] | 596 | try { |
Ben Murdoch | ca12cfa | 2009-11-17 13:57:44 +0000 | [diff] [blame] | 597 | // We allow bookmarks with a javascript: scheme, but these will in most cases |
| 598 | // fail URI parsing, so don't try it if that's the kind of bookmark we have. |
| 599 | |
| 600 | if (!url.toLowerCase().startsWith("javascript:")) { |
| 601 | URI uriObj = new URI(url); |
| 602 | String scheme = uriObj.getScheme(); |
| 603 | if (!Bookmarks.urlHasAcceptableScheme(url)) { |
| 604 | // If the scheme was non-null, let the user know that we |
| 605 | // can't save their bookmark. If it was null, we'll assume |
| 606 | // they meant http when we parse it in the WebAddress class. |
| 607 | if (scheme != null) { |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 608 | mAddress.setError(r.getText(R.string.bookmark_cannot_save_url)); |
Ben Murdoch | ca12cfa | 2009-11-17 13:57:44 +0000 | [diff] [blame] | 609 | return false; |
| 610 | } |
| 611 | WebAddress address; |
| 612 | try { |
| 613 | address = new WebAddress(unfilteredUrl); |
| 614 | } catch (ParseException e) { |
| 615 | throw new URISyntaxException("", ""); |
| 616 | } |
Bjorn Bringert | 131ab51 | 2010-10-12 16:25:47 +0100 | [diff] [blame] | 617 | if (address.getHost().length() == 0) { |
Ben Murdoch | ca12cfa | 2009-11-17 13:57:44 +0000 | [diff] [blame] | 618 | throw new URISyntaxException("", ""); |
| 619 | } |
| 620 | url = address.toString(); |
Ben Murdoch | de35362 | 2009-10-12 10:29:00 +0100 | [diff] [blame] | 621 | } |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 622 | } |
Cary Clark | f2407c6 | 2009-09-04 12:25:10 -0400 | [diff] [blame] | 623 | } catch (URISyntaxException e) { |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 624 | mAddress.setError(r.getText(R.string.bookmark_url_not_valid)); |
Cary Clark | f2407c6 | 2009-09-04 12:25:10 -0400 | [diff] [blame] | 625 | return false; |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 626 | } |
Ben Murdoch | aac7aa6 | 2009-09-17 16:57:40 +0100 | [diff] [blame] | 627 | |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 628 | if (mEditingExisting) { |
| 629 | mMap.putString("title", title); |
| 630 | mMap.putString("url", url); |
| 631 | mMap.putBoolean("invalidateThumbnail", !url.equals(mOriginalUrl)); |
Leon Scroggins III | 052ce66 | 2010-09-13 14:44:16 -0400 | [diff] [blame] | 632 | // FIXME: This does not work yet |
| 633 | mMap.putLong(BrowserContract.Bookmarks.PARENT, mCurrentFolder); |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 634 | setResult(RESULT_OK, (new Intent()).setAction( |
| 635 | getIntent().toString()).putExtras(mMap)); |
| 636 | } else { |
| 637 | // Post a message to write to the DB. |
| 638 | Bundle bundle = new Bundle(); |
| 639 | bundle.putString("title", title); |
| 640 | bundle.putString("url", url); |
| 641 | bundle.putParcelable("thumbnail", mThumbnail); |
| 642 | bundle.putBoolean("invalidateThumbnail", !url.equals(mOriginalUrl)); |
| 643 | bundle.putString("touchIconUrl", mTouchIconUrl); |
| 644 | Message msg = Message.obtain(mHandler, SAVE_BOOKMARK); |
| 645 | msg.setData(bundle); |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 646 | // Start a new thread so as to not slow down the UI |
Henrik Baard | 980e995 | 2010-09-06 18:13:23 +0200 | [diff] [blame] | 647 | Thread t = new Thread(new SaveBookmarkRunnable(getApplicationContext(), msg)); |
Leon Scroggins | 02065b0 | 2010-01-04 14:30:13 -0500 | [diff] [blame] | 648 | t.start(); |
Ben Murdoch | 1794fe2 | 2009-09-29 18:14:30 +0100 | [diff] [blame] | 649 | setResult(RESULT_OK); |
Kristian Monsen | 0a1d838 | 2010-02-01 18:41:07 +0000 | [diff] [blame] | 650 | LogTag.logBookmarkAdded(url, "bookmarkview"); |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 651 | } |
| 652 | return true; |
| 653 | } |
Michael Kolb | 31829b9 | 2010-10-01 11:50:21 -0700 | [diff] [blame] | 654 | |
The Android Open Source Project | 0c90888 | 2009-03-03 19:32:16 -0800 | [diff] [blame] | 655 | } |