-
-
Notifications
You must be signed in to change notification settings - Fork 141
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New Tor implementation and persistent LND + Tor services
- Loading branch information
Showing
32 changed files
with
722 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
android/app/src/main/java/com/msopentech/thali/android/installer/AndroidTorInstaller.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| package com.msopentech.thali.android.installer;/* | ||
| Copyright (c) Microsoft Open Technologies, Inc. | ||
| All Rights Reserved | ||
| Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the | ||
| License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, | ||
| INCLUDING WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, | ||
| MERCHANTABLITY OR NON-INFRINGEMENT. | ||
| See the Apache 2 License for the specific language governing permissions and limitations under the License. | ||
| */ | ||
| //package com.msopentech.thali.android.installer; | ||
|
|
||
|
|
||
| import android.content.Context; | ||
| import android.util.Log; | ||
| //import com.msopentech.thali.toronionproxy.TorInstaller; | ||
| //import org.torproject.android.binary.TorResourceInstaller; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileNotFoundException; | ||
| import java.io.IOException; | ||
| import java.util.concurrent.TimeoutException; | ||
|
|
||
| /** | ||
| * Installs Tor for an Android app. This is a wrapper around the <code>TorResourceInstaller</code>. | ||
| * | ||
| * Since this class only deals with installing Tor, it is up to the developer to implement | ||
| * the <code>openBridgesStream</code> which will give the bridges for pluggable transports. A | ||
| * typical implementation looks like: | ||
| * | ||
| * <code> | ||
| * public InputStream openBridgesStream() throws IOException { | ||
| * return context.getResources().openRawResource(R.raw.bridges); | ||
| * } | ||
| * </code> | ||
| */ | ||
| public class AndroidTorInstaller { | ||
|
|
||
| // private final TorResourceInstaller resourceInstaller; | ||
|
|
||
| private static final String TAG = "AndroidTorInstaller"; | ||
|
|
||
| protected final Context context; | ||
|
|
||
| protected File torrcFile; | ||
|
|
||
| /** | ||
| * The configDir will be the location of tor configuration files. It contains the files, geoip, geoip6, | ||
| * bridges.txt and the default torrc file. | ||
| * | ||
| * The location of tor executable will be in the Android native library directory for the app. | ||
| */ | ||
| public AndroidTorInstaller(Context context, File configDir) { | ||
| // this.resourceInstaller = new TorResourceInstaller(context, configDir); | ||
| this.context = context; | ||
| } | ||
|
|
||
| public void updateTorConfigCustom(String content) throws IOException, TimeoutException { | ||
| if(torrcFile == null) { | ||
| throw new FileNotFoundException("Unable to find torrc file. Have you installed Tor resources?"); | ||
| } | ||
| // resourceInstaller.updateTorConfigCustom(torrcFile, content); | ||
| } | ||
|
|
||
| // @Override | ||
| public void setup() throws IOException { | ||
| // try { | ||
| // File torFile = resourceInstaller.installResources(); | ||
| // if(torFile != null) { | ||
| // Log.d("AndroidTorInstaller", "tor executable = " + torFile.getAbsolutePath()); | ||
| // } else { | ||
| // Log.w(TAG, "Failed to setup tor. No tor executable installed"); | ||
| // throw new IOException("Failed to Failed to setup tor. No tor executable installed"); | ||
| // } | ||
|
|
||
| // this.torrcFile = resourceInstaller.getTorrcFile(); | ||
| // if(torrcFile != null) { | ||
| // Log.d("AndroidTorInstaller", "torrc = " + torrcFile.getAbsolutePath()); | ||
| // } else { | ||
| // Log.w(TAG, "Failed to setup tor. No torrc file installed"); | ||
| // throw new IOException("Failed to Failed to setup tor. No torrc file installed"); | ||
| // } | ||
|
|
||
| // } catch (TimeoutException e) { | ||
| // Log.w(TAG, "Failed to setup tor: " + e.getMessage()); | ||
| // throw new IOException(e); | ||
| // } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 0 additions & 13 deletions
13
android/app/src/main/java/com/zeus/LndMobileScheduledSync.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.