From 91ebd8b5be284ca392e392bd610e9becfc8e6686 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Tue, 30 Oct 2018 11:43:51 -0700 Subject: [PATCH] invote cwtch App so as tor manager starts properly --- README.md | 12 ++++++++++++ main.go | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..5333dae --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ +# Setup + +## Android + +A arm-pie version of tor like [tor-0.3.4.8.arm-pie](https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/tor/tor-0.3.4.8.arm-pie) is required to be placed in `android/libs/armeabi-v7a` with the name `libtor.so` + +# Deployment + +## Android + + qtdeploy -docker build android + adb install deploy/android/build-debug.apk diff --git a/main.go b/main.go index aaa27ba..0db9824 100644 --- a/main.go +++ b/main.go @@ -22,6 +22,7 @@ import ( "log" "cwtch.im/cwtch/model" "encoding/hex" + "cwtch.im/cwtch/app" ) var gcd *GrandCentralDispatcher @@ -259,7 +260,10 @@ func initialize(view *quick.QQuickView) { } os.MkdirAll(dirname, 0700) - var err error + + _, err := app.NewApp("/data/data/org.qtproject.example.go/files/", "/data/data/org.qtproject.example.go/lib/libtor.so") + log.Printf("starting Swtch app: err: %v\n", err) + peer, err = libpeer.LoadCwtchPeer(filename, "be gay do crime") if err != nil { fmt.Println("couldn't load your config file, attempting to create a new one now") @@ -307,6 +311,7 @@ func initialize(view *quick.QQuickView) { gcd.AddContact(group.GroupID[:12], group.GroupID, group.GroupServer, randomGroupImage(groups[i]), "0", group.Accepted) log.Printf("GROUP %s@%s", group.GroupID, group.GroupServer) } + } // temporary until we do real picture selection