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

Moving to net cipher 2.0.0-alpha away from submodule

Browse Source
This commit is contained in:
anthony restaino 2017-03-18 22:39:23 -04:00
parent 77a2f61df3
commit 14ef8c7077
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -1,7 +1,3 @@
[submodule "external/netcipher"]
path = external/netcipher
url = https://github.com/guardianproject/NetCipher.git
branch = master
[submodule "Bonsai"] [submodule "Bonsai"]
path = Bonsai path = Bonsai
url = https://github.com/anthonycr/Bonsai.git url = https://github.com/anthonycr/Bonsai.git

7
app/build.gradle
View File

@ -92,10 +92,9 @@ dependencies {
// proxy support // proxy support
compile 'net.i2p.android:client:0.8' compile 'net.i2p.android:client:0.8'
// Use the following code to update the libnetcipher submodule // tor proxy
// git submodule foreach git reset --hard compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'
// git submodule update --remote compile 'info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1'
compile project(':libnetcipher')
compile project(':bonsai') compile project(':bonsai')

2
app/src/main/java/acr/browser/lightning/utils/ProxyUtils.java
View File

@ -20,7 +20,7 @@ import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.dialog.BrowserDialog; import acr.browser.lightning.dialog.BrowserDialog;
import acr.browser.lightning.preference.PreferenceManager; import acr.browser.lightning.preference.PreferenceManager;
import info.guardianproject.netcipher.proxy.OrbotHelper; import info.guardianproject.netcipher.proxy.OrbotHelper;
import info.guardianproject.netcipher.web.WebkitProxy; import info.guardianproject.netcipher.webkit.WebkitProxy;
@Singleton @Singleton
public class ProxyUtils { public class ProxyUtils {

2
settings.gradle
View File

@ -1,8 +1,6 @@
include ':app' include ':app'
include ':libnetcipher'
include ':bonsai' include ':bonsai'
include ':animated-progress-bar' include ':animated-progress-bar'
project(':libnetcipher').projectDir = new File(rootProject.projectDir, 'external/netcipher/libnetcipher')
project(':bonsai').projectDir = new File(rootProject.projectDir, 'Bonsai/library') project(':bonsai').projectDir = new File(rootProject.projectDir, 'Bonsai/library')
project(':animated-progress-bar').projectDir = new File(rootProject.projectDir, 'AnimatedProgressBar/library') project(':animated-progress-bar').projectDir = new File(rootProject.projectDir, 'AnimatedProgressBar/library')