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

Merge remote-tracking branch 'refs/remotes/origin/dev'

Browse Source
This commit is contained in:
Anthony Restaino 2016-11-05 13:12:25 -04:00
commit 748775a429
5 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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
}
}

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

@ -134,8 +134,12 @@ public class TabsManager {
mCurrentTab = null;
if (mPreferenceManager.getRestoreLostTabsEnabled()) {
restoreLostTabs(url, activity, subscriber);
} else {
if (!TextUtils.isEmpty(url)) {
newTab(activity, url, false);
} else {
newTab(activity, null, false);
}
finishInitialization();
subscriber.onComplete();
}

11
app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java
View File

@ -127,6 +127,13 @@ public class BookmarksFragment extends Fragment implements View.OnClickListener,
ThemeUtils.getIconLightThemeColor(context);
}
private TabsManager getTabsManager() {
if (mTabsManager == null) {
mTabsManager = mUiController.getTabModel();
}
return mTabsManager;
}
// Handle bookmark click
private final OnItemClickListener mItemClickListener = new OnItemClickListener() {
@Override
@ -311,7 +318,7 @@ public class BookmarksFragment extends Fragment implements View.OnClickListener,
mUiController.bookmarkButtonClicked();
break;
case R.id.action_reading:
LightningView currentTab = mTabsManager.getCurrentTab();
LightningView currentTab = getTabsManager().getCurrentTab();
if (currentTab != null) {
Intent read = new Intent(getActivity(), ReadingActivity.class);
read.putExtra(Constants.LOAD_READING_URL, currentTab.getUrl());
@ -319,7 +326,7 @@ public class BookmarksFragment extends Fragment implements View.OnClickListener,
}
break;
case R.id.action_toggle_desktop:
LightningView current = mTabsManager.getCurrentTab();
LightningView current = getTabsManager().getCurrentTab();
if (current != null) {
current.toggleDesktopUA(getActivity());
current.reload();

15
app/src/main/java/acr/browser/lightning/fragment/TabsFragment.java
View File

@ -147,6 +147,13 @@ public class TabsFragment extends Fragment implements View.OnClickListener, View
return view;
}
private TabsManager getTabsManager() {
if (mTabsManager == null) {
mTabsManager = mUiController.getTabModel();
}
return mTabsManager;
}
private void setupFrameLayoutButton(@NonNull final View root, @IdRes final int buttonId,
@IdRes final int imageId) {
final View frameButton = root.findViewById(buttonId);
@ -210,7 +217,7 @@ public class TabsFragment extends Fragment implements View.OnClickListener, View
public void onClick(@NonNull View v) {
switch (v.getId()) {
case R.id.tab_header_button:
mUiController.showCloseDialog(mTabsManager.indexOfCurrentTab());
mUiController.showCloseDialog(getTabsManager().indexOfCurrentTab());
break;
case R.id.new_tab_button:
mUiController.newTabButtonClicked();
@ -243,7 +250,7 @@ public class TabsFragment extends Fragment implements View.OnClickListener, View
@Override
public void tabAdded() {
if (mTabsAdapter != null) {
mTabsAdapter.notifyItemInserted(mTabsManager.last());
mTabsAdapter.notifyItemInserted(getTabsManager().last());
mRecyclerView.postDelayed(new Runnable() {
@Override
public void run() {
@ -315,7 +322,7 @@ public class TabsFragment extends Fragment implements View.OnClickListener, View
ViewCompat.jumpDrawablesToCurrentState(holder.exitButton);
LightningView web = mTabsManager.getTabAtPosition(position);
LightningView web = getTabsManager().getTabAtPosition(position);
if (web == null) {
return;
}
@ -360,7 +367,7 @@ public class TabsFragment extends Fragment implements View.OnClickListener, View
@Override
public int getItemCount() {
return mTabsManager.size();
return getTabsManager().size();
}
public Bitmap getDesaturatedBitmap(@NonNull Bitmap favicon) {

23
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() {
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