diff --git a/README.md b/README.md index 5c4d40c..ec170d8 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,25 @@ -# Lightning Browser [![Build Status](https://travis-ci.org/anthonycr/Lightning-Browser.svg?branch=master)](https://travis-ci.org/anthonycr/Lightning-Browser) +# Lightning Browser #### Speed, Simplicity, Security ![](ic_launcher_small.png) -#### Download -[Get it on F-Droid](https://f-droid.org/app/acr.browser.lightning) [](https://play.google.com/store/apps/details?id=acr.browser.lightning) - -#### Master Branch -* [![Build Status](https://travis-ci.org/anthonycr/Lightning-Browser.svg?branch=master)](https://travis-ci.org/anthonycr/Lightning-Browser) - -#### Dev Branch -* [![Build Status](https://travis-ci.org/anthonycr/Lightning-Browser.svg?branch=dev)](https://travis-ci.org/anthonycr/Lightning-Browser) +#### About fork +That fork of Lightning Browser aims on native support of I2P without ability go clearnet sites. #### Features * Bookmarks * History -* Multiple search engines (Google, Bing, Yahoo, StartPage, DuckDuckGo, etc.) - * Incognito mode -* Follows Google design guidelines - * Unique utilization of navigation drawer for tabs -* Google search suggestions +* Support of Legwork I2P search engine -* Orbot Proxy support and I2P support +* Legwork search suggestions + +* TODO: I2P-only support #### Permissions @@ -48,17 +37,6 @@ alt="Get it on Google Play" height="80">](https://play.google.com/store/apps/det * Please contribute code back if you can. The code isn't perfect. * Please add translations/translation fixes as you see need -#### Contributing -* [The Trello Board](https://trello.com/b/Gwjx8MC3/lightning-browser) -* Contributions are always welcome -* If you want a feature and can code, feel free to fork and add the change yourself and make a pull request -* PLEASE use the ````dev```` branch when contributing as the ````master```` branch is supposed to be for stable builds. I will not reject your pull request if you make it on master, but it will annoy me and make my life harder. -* Code Style - * Hungarian Notation - * Prefix member variables with 'm' - * Prefix static member variables with 's' - * Use 4 spaces instead of a tab (\t) - #### License ``` Copyright 2014 Anthony Restaino @@ -70,4 +48,8 @@ Lightning Browser was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/ + +Coryright 2018 PurpleI2P + +Fork of Lightning Browser with same license ``` diff --git a/app/src/main/java/org/purplei2p/lightning/browser/activity/BrowserActivity.java b/app/src/main/java/org/purplei2p/lightning/browser/activity/BrowserActivity.java index 54df923..39f0033 100644 --- a/app/src/main/java/org/purplei2p/lightning/browser/activity/BrowserActivity.java +++ b/app/src/main/java/org/purplei2p/lightning/browser/activity/BrowserActivity.java @@ -1371,7 +1371,6 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements @Override protected void onStop() { super.onStop(); - mProxyUtils.onStop(); } @Override @@ -1388,7 +1387,6 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements @Override protected void onStart() { super.onStart(); - mProxyUtils.onStart(this); } @Override diff --git a/app/src/main/java/org/purplei2p/lightning/preference/PreferenceManager.java b/app/src/main/java/org/purplei2p/lightning/preference/PreferenceManager.java index bb241f7..fb960b9 100644 --- a/app/src/main/java/org/purplei2p/lightning/preference/PreferenceManager.java +++ b/app/src/main/java/org/purplei2p/lightning/preference/PreferenceManager.java @@ -262,7 +262,7 @@ public class PreferenceManager { case Constants.PROXY_MANUAL: return proxy; default: - return Constants.NO_PROXY; + return Constants.PROXY_I2P; } } diff --git a/app/src/main/java/org/purplei2p/lightning/utils/ProxyUtils.java b/app/src/main/java/org/purplei2p/lightning/utils/ProxyUtils.java index 86d3afb..618319b 100644 --- a/app/src/main/java/org/purplei2p/lightning/utils/ProxyUtils.java +++ b/app/src/main/java/org/purplei2p/lightning/utils/ProxyUtils.java @@ -151,12 +151,6 @@ public class ProxyUtils { } } - public void onStop() { - } - - public void onStart(final Activity activity) { - } - @Constants.Proxy public static int setProxyChoice(int choice, @NonNull Activity activity) { switch (choice) { diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 5465139..b6ee69f 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 0b49f0a..e242f3e 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index df428d5..640e87d 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 6e97e3a..51648f7 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/ic_launcher.png b/ic_launcher.png index 5a594df..622b541 100644 Binary files a/ic_launcher.png and b/ic_launcher.png differ diff --git a/ic_launcher_small.png b/ic_launcher_small.png index 4c138e6..d36b887 100644 Binary files a/ic_launcher_small.png and b/ic_launcher_small.png differ