r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request #1 from anthonycr/dev

Browse Source 
Update base
This commit is contained in:
Death Mask Salesman 2016-11-09 12:40:30 +01:00 committed by GitHub
commit 28dca5ee83
5 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AnimatedProgressBar

@ -1 +1 @@
Subproject commit 2d7f756be8f562b2cedca46de7d2ff24f9383040
Subproject commit e7d6ec28baac7cc6909466fc0c8fc8c5e3de6f9d

2
Bonsai

@ -1 +1 @@
Subproject commit 53608c03b77d598aaebd17eb0acbedd8ffb1bf51
Subproject commit 68eb7eb377803f7971baedb28144aa3b1c420cd0

6
app/build.gradle
View File

@ -9,7 +9,7 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 24
versionName "4.4.0"
versionName "4.4.1"
vectorDrawables.useSupportLibrary = true
}
@ -36,13 +36,13 @@ android {
lightningPlus {
buildConfigField "boolean", "FULL_VERSION", "true"
applicationId "acr.browser.lightning"
versionCode 89
versionCode 90
}
lightningLite {
buildConfigField "boolean", "FULL_VERSION", "false"
applicationId "acr.browser.barebones"
versionCode 91
versionCode 92
}
}

6
app/src/main/java/acr/browser/lightning/activity/TabsManager.java
View File

@ -135,7 +135,11 @@ public class TabsManager {
if (mPreferenceManager.getRestoreLostTabsEnabled()) {
restoreLostTabs(url, activity, subscriber);
} else {
newTab(activity, null, false);
if (!TextUtils.isEmpty(url)) {
newTab(activity, url, false);
} else {
newTab(activity, null, false);
}
finishInitialization();
subscriber.onComplete();
}

27
app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java
View File

@ -15,6 +15,13 @@ import android.widget.Filterable;
import android.widget.ImageView;
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.FilenameFilter;
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.HistoryItem;
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;
public class SuggestionsAdapter extends BaseAdapter implements Filterable {
@ -99,8 +98,16 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable {
}
public void refreshBookmarks() {
mAllBookmarks.clear();
mAllBookmarks.addAll(mBookmarkManager.getAllBookmarks(true));
Observable.create(new Action<Void>() {
@Override
public void onSubscribe(@NonNull Subscriber<Void> subscriber) {
mAllBookmarks.clear();
mAllBookmarks.addAll(mBookmarkManager.getAllBookmarks(true));
subscriber.onComplete();
}
}).subscribeOn(Schedulers.io())
.subscribe();
}
@Override