Skip to content

Commit

Permalink
Moving node-wrapper to own package (#82)
Browse files Browse the repository at this point in the history
* Moving node-wrapper to own package

* Add jna-android artifacts

* Support require dependencies from upstream
  • Loading branch information
desyncr authored Apr 24, 2021
1 parent e56718f commit 7be6721
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 318 deletions.
29 changes: 5 additions & 24 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ android {
repositories {
jcenter()
maven { url 'https://jitpack.io' }
maven { url 'https://mvn.freenetproject.org' }
}

dependencies {
Expand All @@ -53,39 +54,19 @@ dependencies {
implementation 'com.jakewharton:process-phoenix:2.0.0'

// Freenet dependencies
implementation 'org.bouncycastle:bcpkix-jdk15on:1.59'
implementation "org.bouncycastle:bcprov-jdk15on:1.59"

implementation "tanukisoft:wrapper:3.2.3"
implementation "org.apache.commons:commons-compress:1.4.1"
implementation "org.b1.pack:lzma-sdk-4j:9.22.0"

implementation 'com.github.Bombe:jFCPlib:v0.1.6'

implementation 'com.github.freenet-mobile:mantissa:0.0.3'
implementation "com.github.freenet-mobile:lzmajio:0.95.4"
implementation 'com.github.freenet-mobile:onion-common:0.0.3'
implementation 'com.github.freenet-mobile:onion-fec:0.0.4'
implementation 'com.github.freenet-mobile:freenet-ext:0.60.3'

implementation 'net.java.dev.jna:jna:4.5.2@aar'
implementation ('com.github.freenet-mobile:fred:1490.2m') {
implementation ('com.github.freenet-mobile:node-wrapper:0.5') {
exclude group: 'org.freenetproject', module: 'freenet-ext'
exclude group: 'net.java.dev.jna', module: 'jna'
exclude group: 'net.java.dev.jna', module: 'jna-platform'
}

implementation ('com.github.desyncr:plugin-sharesite:0.4.7.7m') {
exclude group: 'net.java.dev.jna', module: 'jna'
exclude group: 'net.java.dev.jna', module: 'jna-platform'
exclude group: 'net.java', module: 'textile-j'
}
implementation 'net.java.dev.jna:jna:4.5.2@aar'
// End Freenet dependencies

// For running a locally built freenet.jar
//implementation "net.java.dev.jna:jna:4.5.2"
//implementation "net.java.dev.jna:jna-platform:4.5.2"
//implementation files('libs/freenet.jar')


implementation 'androidx.preference:preference:1.1.1'

testImplementation 'junit:junit:4.12'
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@
import java.util.HashMap;
import java.util.Map;

import org.freenetproject.mobile.Runner;
import org.freenetproject.mobile.Installer;

/**
* Class responsible for exposing data to the UI. It also exposes methods for the UI to interact with,
* such as startService and stopService.
*/
public class Manager {

private static Manager instance = null;
private Runner runner = Runner.getInstance();
private final Runner runner = Runner.getInstance();

public enum Status {
STARTING_UP,
Expand Down
145 changes: 0 additions & 145 deletions app/src/main/java/org/freenetproject/mobile/services/node/Runner.java

This file was deleted.

0 comments on commit 7be6721

Please # to comment.