commit
28dca5ee83
@ -1 +1 @@
|
|||||||
Subproject commit 2d7f756be8f562b2cedca46de7d2ff24f9383040
|
Subproject commit e7d6ec28baac7cc6909466fc0c8fc8c5e3de6f9d
|
2
Bonsai
2
Bonsai
@ -1 +1 @@
|
|||||||
Subproject commit 53608c03b77d598aaebd17eb0acbedd8ffb1bf51
|
Subproject commit 68eb7eb377803f7971baedb28144aa3b1c420cd0
|
@ -9,7 +9,7 @@ android {
|
|||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 14
|
minSdkVersion 14
|
||||||
targetSdkVersion 24
|
targetSdkVersion 24
|
||||||
versionName "4.4.0"
|
versionName "4.4.1"
|
||||||
vectorDrawables.useSupportLibrary = true
|
vectorDrawables.useSupportLibrary = true
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -36,13 +36,13 @@ android {
|
|||||||
lightningPlus {
|
lightningPlus {
|
||||||
buildConfigField "boolean", "FULL_VERSION", "true"
|
buildConfigField "boolean", "FULL_VERSION", "true"
|
||||||
applicationId "acr.browser.lightning"
|
applicationId "acr.browser.lightning"
|
||||||
versionCode 89
|
versionCode 90
|
||||||
}
|
}
|
||||||
|
|
||||||
lightningLite {
|
lightningLite {
|
||||||
buildConfigField "boolean", "FULL_VERSION", "false"
|
buildConfigField "boolean", "FULL_VERSION", "false"
|
||||||
applicationId "acr.browser.barebones"
|
applicationId "acr.browser.barebones"
|
||||||
versionCode 91
|
versionCode 92
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -135,7 +135,11 @@ public class TabsManager {
|
|||||||
if (mPreferenceManager.getRestoreLostTabsEnabled()) {
|
if (mPreferenceManager.getRestoreLostTabsEnabled()) {
|
||||||
restoreLostTabs(url, activity, subscriber);
|
restoreLostTabs(url, activity, subscriber);
|
||||||
} else {
|
} else {
|
||||||
newTab(activity, null, false);
|
if (!TextUtils.isEmpty(url)) {
|
||||||
|
newTab(activity, url, false);
|
||||||
|
} else {
|
||||||
|
newTab(activity, null, false);
|
||||||
|
}
|
||||||
finishInitialization();
|
finishInitialization();
|
||||||
subscriber.onComplete();
|
subscriber.onComplete();
|
||||||
}
|
}
|
||||||
|
@ -15,6 +15,13 @@ import android.widget.Filterable;
|
|||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import com.anthonycr.bonsai.Action;
|
||||||
|
import com.anthonycr.bonsai.Observable;
|
||||||
|
import com.anthonycr.bonsai.OnSubscribe;
|
||||||
|
import com.anthonycr.bonsai.Scheduler;
|
||||||
|
import com.anthonycr.bonsai.Schedulers;
|
||||||
|
import com.anthonycr.bonsai.Subscriber;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FilenameFilter;
|
import java.io.FilenameFilter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -33,14 +40,6 @@ import acr.browser.lightning.database.BookmarkManager;
|
|||||||
import acr.browser.lightning.database.HistoryDatabase;
|
import acr.browser.lightning.database.HistoryDatabase;
|
||||||
import acr.browser.lightning.database.HistoryItem;
|
import acr.browser.lightning.database.HistoryItem;
|
||||||
import acr.browser.lightning.preference.PreferenceManager;
|
import acr.browser.lightning.preference.PreferenceManager;
|
||||||
|
|
||||||
import com.anthonycr.bonsai.Action;
|
|
||||||
import com.anthonycr.bonsai.Observable;
|
|
||||||
import com.anthonycr.bonsai.OnSubscribe;
|
|
||||||
import com.anthonycr.bonsai.Scheduler;
|
|
||||||
import com.anthonycr.bonsai.Schedulers;
|
|
||||||
import com.anthonycr.bonsai.Subscriber;
|
|
||||||
|
|
||||||
import acr.browser.lightning.utils.ThemeUtils;
|
import acr.browser.lightning.utils.ThemeUtils;
|
||||||
|
|
||||||
public class SuggestionsAdapter extends BaseAdapter implements Filterable {
|
public class SuggestionsAdapter extends BaseAdapter implements Filterable {
|
||||||
@ -99,8 +98,16 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void refreshBookmarks() {
|
public void refreshBookmarks() {
|
||||||
mAllBookmarks.clear();
|
Observable.create(new Action<Void>() {
|
||||||
mAllBookmarks.addAll(mBookmarkManager.getAllBookmarks(true));
|
@Override
|
||||||
|
public void onSubscribe(@NonNull Subscriber<Void> subscriber) {
|
||||||
|
mAllBookmarks.clear();
|
||||||
|
mAllBookmarks.addAll(mBookmarkManager.getAllBookmarks(true));
|
||||||
|
|
||||||
|
subscriber.onComplete();
|
||||||
|
}
|
||||||
|
}).subscribeOn(Schedulers.io())
|
||||||
|
.subscribe();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
x
Reference in New Issue
Block a user