Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #58

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

Develop #58

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
00279a1
Some cleaning up of AdminApi
benhylau Apr 19, 2016
89b8ee5
Make the app work without root via VpnService
benhylau Apr 28, 2016
d142a19
Add a second public peer
benhylau Apr 29, 2016
2ca111d
Hook up basic UI to AdminApi
benhylau Apr 29, 2016
8638481
Reset IPv6 identity of node
benhylau Apr 29, 2016
701295c
Hide Connectivity Settings
benhylau Apr 29, 2016
09e8638
Sharing cjdns IPv6 on click
benhylau Apr 29, 2016
8f92f7a
Proper shutdown sequence of VPN service
benhylau Apr 30, 2016
fae6224
Automatically build cjdroute and some updates
sssemil Jul 5, 2016
288de07
Update gradle
sssemil Jul 5, 2016
c4718c6
Update API in travis
sssemil Jul 5, 2016
1fb93d8
Oups
sssemil Jul 5, 2016
acfdd7e
Update readme n travis
sssemil Jul 5, 2016
1ba4d57
Hide cjdns build output unless an error is faced
sssemil Jul 5, 2016
221717f
Merge sssemil/patch-2 with hyperboria/develop
benhylau Oct 10, 2016
36d4357
Make everything build
benhylau Oct 12, 2016
a36d9b3
Merge develop
benhylau Oct 12, 2016
5e87f2a
Travis, use jdk8
benhylau Oct 12, 2016
e4203cc
Format
benhylau Oct 12, 2016
b760207
Update docs and fix Travis
benhylau Oct 12, 2016
b2162fe
Merge pull request #66 from hyperboria/sssemil-patch-2-merge
benhylau Oct 13, 2016
147cbc7
Update Gradle and Android SDK versions
benhylau Nov 29, 2016
9121429
Add flag to toggle compilation of cjdns native artifacts
benhylau Nov 29, 2016
4acb574
Update to Dagger 2.8
benhylau Nov 29, 2016
fa329ba
Disable incremental compile
benhylau Nov 29, 2016
f68e7a5
Fix .gitignore and commit missed files
benhylau Nov 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ build/
local.properties
*.iml
*.class
src/main/assets/x86/
src/main/libs/
src/main/obj/
src/main/assets/armeabi/
src/main/assets/armeabi-v7a/
src/main/assets/cjdroute.conf
src/main/assets/arm64-v8a/
src/main/assets/x86/
src/main/assets/x86_64/
src/main/assets/mips/
src/main/assets/mips64/
src/main/assets/all/
6 changes: 5 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:1.3.1'
classpath 'com.android.tools.build:gradle:2.0.0'
}
}

Expand All @@ -27,6 +27,10 @@ android {
versionCode 1
versionName "1.0.0-SNAPSHOT"
}
sourceSets.main {
jni.srcDirs = []
jniLibs.srcDir 'src/main/libs'
}
signingConfigs {
release
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
4 changes: 4 additions & 0 deletions install_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh

ndk-build NDK_DEBUG=true NDK_PROJECT_PATH=src/main/
./gradlew installDebug
4 changes: 4 additions & 0 deletions install_release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh

ndk-build NDK_DEBUG=false NDK_PROJECT_PATH=src/main/
./gradlew installRelease
3 changes: 3 additions & 0 deletions src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
</activity>

<service android:name=".CjdnsService" />
<service
android:name=".CjdnsVpnService"
android:permission="android.permission.BIND_VPN_SERVICE" />

</application>
</manifest>
Loading