Skip to content

Commit

Permalink
Merge pull request #1954 from kaloudis/remove-new-tor-binary
Browse files Browse the repository at this point in the history 
Temporarily remove new Tor binary
  • Loading branch information
@kaloudis
kaloudis authored Jan 20, 2024
2 parents eaf9d57 + d7464ac commit 8d75885
Show file tree
Hide file tree
Showing 9 changed files with 77 additions and 377 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ dependencies {
// Tor + Persistent LND
implementation "com.jakewharton:process-phoenix:2.0.0"

implementation 'info.guardianproject:tor-android:0.4.7.8'
implementation 'info.guardianproject:jtorctl:0.4.5.7'
// implementation 'info.guardianproject:tor-android:0.4.7.8'
// implementation 'info.guardianproject:jtorctl:0.4.5.7'

implementation('dev.doubledot.doki:library:0.0.1@aar') {
transitive = true
Expand Down
89 changes: 0 additions & 89 deletions android/app/src/main/java/com/msopentech/thali/android/installer/AndroidTorInstaller.java
View file

This file was deleted.

10 changes: 5 additions & 5 deletions android/app/src/main/java/com/zeus/LndMobile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

import com.reactnativecommunity.asyncstorage.ReactDatabaseSupplier;
import com.reactnativecommunity.asyncstorage.AsyncLocalStorageUtil;
import org.torproject.jni.TorService;
// import org.torproject.jni.TorService;

// TODO break this class up
class LndMobile extends ReactContextBaseJavaModule {
Expand Down Expand Up @@ -348,10 +348,10 @@ public void startLnd(String args, Boolean isTorEnabled, Boolean isTestnet, Promi

String params = "--lnddir=" + getReactApplicationContext().getFilesDir().getPath();
if (isTorEnabled) {
int listenPort = ZeusTorUtils.getListenPort(isTestnet);
String controlSocket = "unix://" + getReactApplicationContext().getDir(TorService.class.getSimpleName(), Context.MODE_PRIVATE).getAbsolutePath() + "/data/ControlSocket";
params += " --tor.active --tor.control=" + controlSocket;
params += " --tor.v3 --listen=localhost:" + listenPort;
// int listenPort = ZeusTorUtils.getListenPort(isTestnet);
// String controlSocket = "unix://" + getReactApplicationContext().getDir(TorService.class.getSimpleName(), Context.MODE_PRIVATE).getAbsolutePath() + "/data/ControlSocket";
// params += " --tor.active --tor.control=" + controlSocket;
// params += " --tor.v3 --listen=localhost:" + listenPort;
} else {
// If Tor isn't active, make sure we aren't
// listening at all
Expand Down
138 changes: 65 additions & 73 deletions android/app/src/main/java/com/zeus/LndMobileScheduledSyncWorker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import com.google.protobuf.ByteString;
// import com.hypertrack.Hyperlog.Hyperlog;

import org.torproject.jni.TorService;
// import org.torproject.jni.TorService;

public class LndMobileScheduledSyncWorker extends ListenableWorker {
private final String TAG = "LndScheduledSyncWorker";
Expand All @@ -56,7 +56,7 @@ public class LndMobileScheduledSyncWorker extends ListenableWorker {
// we'll close down lnd and the worker
private int numGetInfoCalls = 0;

ZeusTor zeusTor;
// ZeusTor zeusTor;

// private enum WorkState {
// NOT_STARTED, BOUND, WALLET_UNLOCKED, WAITING_FOR_SYNC, DONE;
Expand All @@ -72,7 +72,7 @@ public class LndMobileScheduledSyncWorker extends ListenableWorker {
public LndMobileScheduledSyncWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
super(context, workerParams);
dbSupplier = ReactDatabaseSupplier.getInstance(getApplicationContext());
zeusTor = new ZeusTor(new ReactApplicationContext(getApplicationContext()));
// zeusTor = new ZeusTor(new ReactApplicationContext(getApplicationContext()));
}

@Override
Expand Down Expand Up @@ -116,38 +116,32 @@ public void onSuccess(@Nullable Object value) {
// Hyperlog.d(TAG, "Password retrieved");

if (torEnabled) {
// boolean startTorResult = startTor();
// if (!startTorResult) {
// Log.e(TAG, "Could not start Tor");
// future.set(Result.failure());
// return;
// }
zeusTor.startTor(new PromiseWrapper() {
@Override
void onSuccess(@Nullable Object value) {
// Hyperlog.i(TAG, "Tor started");
// Hyperlog.i(TAG, "torSocksPort: " + (int) value);
torStarted = true;
torSocksPort = (int) value;

startLndWorkThread(completer, password);
}

@Override
void onFail(Throwable throwable) {
// Hyperlog.e(TAG, "Failed to start Tor", throwable);
zeusTor.stopTor(new PromiseWrapper() {
@Override
void onSuccess(@Nullable Object value) {
}

@Override
void onFail(Throwable throwable) {
}
});
completer.set(Result.failure());
}
});
// zeusTor.startTor(new PromiseWrapper() {
// @Override
// void onSuccess(@Nullable Object value) {
// // Hyperlog.i(TAG, "Tor started");
// // Hyperlog.i(TAG, "torSocksPort: " + (int) value);
// torStarted = true;
// torSocksPort = (int) value;

// startLndWorkThread(completer, password);
// }

// @Override
// void onFail(Throwable throwable) {
// // Hyperlog.e(TAG, "Failed to start Tor", throwable);
// zeusTor.stopTor(new PromiseWrapper() {
// @Override
// void onSuccess(@Nullable Object value) {
// }

// @Override
// void onFail(Throwable throwable) {
// }
// });
// completer.set(Result.failure());
// }
// });
} else {
startLndWorkThread(completer, password);
}
Expand Down Expand Up @@ -322,19 +316,17 @@ private void stopWorker(boolean success, CallbackToFutureAdapter.Completer<Resul
unbindLndMobileService();

if (torStarted) {
// if (!MainActivity.started) {
// Hyperlog.i(TAG, "Stopping Tor");
zeusTor.stopTor(new PromiseWrapper() {
@Override
void onSuccess(@Nullable Object value) {
// Hyperlog.i(TAG,"Tor stopped");
}

@Override
void onFail(Throwable throwable) {
// Hyperlog.e(TAG, "Fail while stopping Tor", throwable);
}
});
// zeusTor.stopTor(new PromiseWrapper() {
// @Override
// void onSuccess(@Nullable Object value) {
// // Hyperlog.i(TAG,"Tor stopped");
// }

// @Override
// void onFail(Throwable throwable) {
// // Hyperlog.e(TAG, "Fail while stopping Tor", throwable);
// }
// });
// } else {
// // Hyperlog.w(TAG, "MainActivity was started when shutting down sync work. I will not stop Tor");
// }
Expand All @@ -351,28 +343,28 @@ public void run() {

private boolean startTor(CallbackToFutureAdapter.Completer<Result> completer) {
// Hyperlog.i(TAG, "Starting Tor");
zeusTor.startTor(new PromiseWrapper() {
@Override
void onSuccess(@Nullable Object value) {
// Hyperlog.i(TAG, "Tor started");
// Hyperlog.i(TAG, "torSocksPort: " + (int) value);
torStarted = true;
torSocksPort = (int) value;
}

@Override
void onFail(Throwable throwable) {
// Hyperlog.e(TAG, "Failed to start Tor", throwable);
zeusTor.stopTor(new PromiseWrapper() {
@Override
void onSuccess(@Nullable Object value) {}

@Override
void onFail(Throwable throwable) {}
});
completer.set(Result.failure());
}
});
// zeusTor.startTor(new PromiseWrapper() {
// @Override
// void onSuccess(@Nullable Object value) {
// // Hyperlog.i(TAG, "Tor started");
// // Hyperlog.i(TAG, "torSocksPort: " + (int) value);
// torStarted = true;
// torSocksPort = (int) value;
// }

// @Override
// void onFail(Throwable throwable) {
// // Hyperlog.e(TAG, "Failed to start Tor", throwable);
// zeusTor.stopTor(new PromiseWrapper() {
// @Override
// void onSuccess(@Nullable Object value) {}

// @Override
// void onFail(Throwable throwable) {}
// });
// completer.set(Result.failure());
// }
// });
int torTries = 0;
while (!torStarted) {
if (torTries++ > 40) {
Expand All @@ -396,10 +388,10 @@ private void startLnd() throws RemoteException {
Bundle bundle = new Bundle();
String params = "--lnddir=" + getApplicationContext().getFilesDir().getPath();
if (torEnabled) {
String controlSocket = "unix://" + getApplicationContext().getDir(TorService.class.getSimpleName(), Context.MODE_PRIVATE).getAbsolutePath() + "/data/ControlSocket";
// String controlSocket = "unix://" + getApplicationContext().getDir(TorService.class.getSimpleName(), Context.MODE_PRIVATE).getAbsolutePath() + "/data/ControlSocket";
// Hyperlog.d(TAG, "Adding Tor params for starting lnd, torSocksPort: " + torSocksPort + ", controlSocket: " + controlSocket);
params += " --tor.active --tor.socks=127.0.0.1:" + torSocksPort + " --tor.control=" + controlSocket;
params += " --nolisten";
// params += " --tor.active --tor.socks=127.0.0.1:" + torSocksPort + " --tor.control=" + controlSocket;
// params += " --nolisten";
}
else {
// If Tor isn't active, make sure we aren't
Expand Down
8 changes: 4 additions & 4 deletions android/app/src/main/java/com/zeus/LndMobileTools.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
import com.jakewharton.processphoenix.ProcessPhoenix;
import com.oblador.keychain.KeychainModule;

import org.torproject.jni.TorService;
// import org.torproject.jni.TorService;
import com.reactnativecommunity.asyncstorage.ReactDatabaseSupplier;
import com.reactnativecommunity.asyncstorage.AsyncLocalStorageUtil;

Expand Down Expand Up @@ -484,9 +484,9 @@ public void deleteTLSCerts(Promise promise) {

@ReactMethod
public void restartApp() {
Intent stopTorIntent = new Intent(getReactApplicationContext(), TorService.class);
stopTorIntent.setAction("org.torproject.android.intent.action.STOP");
getReactApplicationContext().stopService(stopTorIntent);
// Intent stopTorIntent = new Intent(getReactApplicationContext(), TorService.class);
// stopTorIntent.setAction("org.torproject.android.intent.action.STOP");
// getReactApplicationContext().stopService(stopTorIntent);
Intent stopLndIntent = new Intent(getReactApplicationContext(), LndMobileService.class);
stopLndIntent.setAction("app.zeusln.zeus.android.intent.action.STOP");
getReactApplicationContext().startService(stopLndIntent);
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/java/com/zeus/MainApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected List<ReactPackage> getPackages() {
packages.add(new LndMobileToolsPackage());
packages.add(new LndMobileScheduledSyncPackage());
packages.add(new LncPackage());
packages.add(new ZeusTorPackage());
// packages.add(new ZeusTorPackage());

return packages;
}
Expand Down
Loading

0 comments on commit 8d75885

Please sign in to comment.