|
|
@ -359,7 +359,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements |
|
|
|
public void run() { |
|
|
|
public void run() { |
|
|
|
mBookmarkManager = BookmarkManager.getInstance(mActivity.getApplicationContext()); |
|
|
|
mBookmarkManager = BookmarkManager.getInstance(mActivity.getApplicationContext()); |
|
|
|
setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(null, true), false); |
|
|
|
setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(null, true), false); |
|
|
|
if (mBookmarkList.size() == 0 && mPreferences.getDefaultBookmarks()) { |
|
|
|
if (mBookmarkList.isEmpty() && mPreferences.getDefaultBookmarks()) { |
|
|
|
for (String[] array : BookmarkManager.DEFAULT_BOOKMARKS) { |
|
|
|
for (String[] array : BookmarkManager.DEFAULT_BOOKMARKS) { |
|
|
|
HistoryItem bookmark = new HistoryItem(array[0], array[1]); |
|
|
|
HistoryItem bookmark = new HistoryItem(array[0], array[1]); |
|
|
|
if (mBookmarkManager.addBookmark(bookmark)) { |
|
|
|
if (mBookmarkManager.addBookmark(bookmark)) { |
|
|
@ -635,7 +635,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements |
|
|
|
String[] array = Utils.getArray(mem); |
|
|
|
String[] array = Utils.getArray(mem); |
|
|
|
int count = 0; |
|
|
|
int count = 0; |
|
|
|
for (String urlString : array) { |
|
|
|
for (String urlString : array) { |
|
|
|
if (urlString.length() > 0) { |
|
|
|
if (!urlString.isEmpty()) { |
|
|
|
if (url != null && url.compareTo(urlString) == 0) { |
|
|
|
if (url != null && url.compareTo(urlString) == 0) { |
|
|
|
url = null; |
|
|
|
url = null; |
|
|
|
} |
|
|
|
} |
|
|
@ -918,7 +918,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void onClick(DialogInterface dialog, int which) { |
|
|
|
public void onClick(DialogInterface dialog, int which) { |
|
|
|
String query = getHome.getText().toString(); |
|
|
|
String query = getHome.getText().toString(); |
|
|
|
if (query.length() > 0) |
|
|
|
if (!query.isEmpty()) |
|
|
|
showSearchInterfaceBar(query); |
|
|
|
showSearchInterfaceBar(query); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
@ -933,7 +933,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements |
|
|
|
mSearchBar.setVisibility(View.VISIBLE); |
|
|
|
mSearchBar.setVisibility(View.VISIBLE); |
|
|
|
|
|
|
|
|
|
|
|
TextView tw = (TextView) findViewById(R.id.search_query); |
|
|
|
TextView tw = (TextView) findViewById(R.id.search_query); |
|
|
|
tw.setText("'" + text + "'"); |
|
|
|
tw.setText('\'' + text + '\''); |
|
|
|
|
|
|
|
|
|
|
|
ImageButton up = (ImageButton) findViewById(R.id.button_next); |
|
|
|
ImageButton up = (ImageButton) findViewById(R.id.button_next); |
|
|
|
up.setOnClickListener(this); |
|
|
|
up.setOnClickListener(this); |
|
|
@ -1077,7 +1077,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements |
|
|
|
mBookmarkManager.editBookmark(mBookmarkList.get(id), item); |
|
|
|
mBookmarkManager.editBookmark(mBookmarkList.get(id), item); |
|
|
|
|
|
|
|
|
|
|
|
List<HistoryItem> list = mBookmarkManager.getBookmarksFromFolder(currentFolder, true); |
|
|
|
List<HistoryItem> list = mBookmarkManager.getBookmarksFromFolder(currentFolder, true); |
|
|
|
if (list.size() == 0) { |
|
|
|
if (list.isEmpty()) { |
|
|
|
setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(null, true), true); |
|
|
|
setBookmarkDataSet(mBookmarkManager.getBookmarksFromFolder(null, true), true); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
setBookmarkDataSet(list, false); |
|
|
|
setBookmarkDataSet(list, false); |
|
|
@ -1451,7 +1451,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements |
|
|
|
if (mPreferences.getRestoreLostTabsEnabled()) { |
|
|
|
if (mPreferences.getRestoreLostTabsEnabled()) { |
|
|
|
String s = ""; |
|
|
|
String s = ""; |
|
|
|
for (int n = 0; n < mWebViewList.size(); n++) { |
|
|
|
for (int n = 0; n < mWebViewList.size(); n++) { |
|
|
|
if (mWebViewList.get(n).getUrl().length() > 0) { |
|
|
|
if (!mWebViewList.get(n).getUrl().isEmpty()) { |
|
|
|
s = s + mWebViewList.get(n).getUrl() + "|$|SEPARATOR|$|"; |
|
|
|
s = s + mWebViewList.get(n).getUrl() + "|$|SEPARATOR|$|"; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|