wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1186037 - Import bookmarks and history from stock browser (Samsung S4, Android 4.4.2) doesn't work. r=mhaigh

Browse Source
This commit is contained in:
Chenxia Liu 2015-08-13 11:45:23 -07:00
parent fcca74c977
commit 3926455361
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mobile/android/base/preferences/AndroidImport.java
View File

@ -5,6 +5,7 @@
package org.mozilla.gecko.preferences;
import android.os.Build;
import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.db.BrowserContract;
import org.mozilla.gecko.db.BrowserContract.Bookmarks;
@ -43,6 +44,10 @@ class AndroidImport implements Runnable {
}
}
public static final Uri SAMSUNG_BOOKMARKS_URI = Uri.parse("content://com.sec.android.app.sbrowser.browser/bookmarks");
public static final Uri SAMSUNG_HISTORY_URI = Uri.parse("content://com.sec.android.app.sbrowser.browser/history");
public static final String SAMSUNG_MANUFACTURER = "samsung";
private static final String LOGTAG = "AndroidImport";
private final Context mContext;
private final Runnable mOnDoneRunnable;
@ -72,6 +77,10 @@ class AndroidImport implements Runnable {
null,
null);
if (Build.MANUFACTURER.equals(SAMSUNG_MANUFACTURER) && cursor.getCount() == 0) {
cursor = mCr.query(SAMSUNG_BOOKMARKS_URI, null, null, null, null);
}
if (cursor != null) {
final int faviconCol = cursor.getColumnIndexOrThrow(LegacyBrowserProvider.BookmarkColumns.FAVICON);
final int titleCol = cursor.getColumnIndexOrThrow(LegacyBrowserProvider.BookmarkColumns.TITLE);
@ -121,6 +130,10 @@ class AndroidImport implements Runnable {
null,
null);
if (Build.MANUFACTURER.equals(SAMSUNG_MANUFACTURER) && cursor.getCount() == 0) {
cursor = mCr.query(SAMSUNG_HISTORY_URI, null, null, null, null);
}
if (cursor != null) {
final int dateCol = cursor.getColumnIndexOrThrow(LegacyBrowserProvider.BookmarkColumns.DATE);
final int faviconCol = cursor.getColumnIndexOrThrow(LegacyBrowserProvider.BookmarkColumns.FAVICON);