-
-
Notifications
You must be signed in to change notification settings - Fork 70
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
Co-authored-by: djkazic <[email protected]>
- Loading branch information
Showing
29 changed files
with
681 additions
and
173 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +0,0 @@ | ||
| [submodule "tor"] | ||
| path = tor | ||
| url = https://github.com/thaliproject/Tor_Onion_Proxy_Library | ||
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
165 changes: 165 additions & 0 deletions
165
android/app/src/main/java/com/blixtwallet/BlixtTor.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,165 @@ | ||
| package com.blixtwallet; | ||
|
|
||
| import android.app.Notification; | ||
| import android.app.NotificationChannel; | ||
| import android.app.NotificationManager; | ||
| import android.app.PendingIntent; | ||
|
|
||
| import android.content.BroadcastReceiver; | ||
| import android.content.ComponentName; | ||
| import android.content.Context; | ||
| import android.content.Intent; | ||
| import android.content.IntentFilter; | ||
| import android.content.ServiceConnection; | ||
| import android.database.sqlite.SQLiteDatabase; | ||
| import android.os.Build; | ||
| import android.os.IBinder; | ||
| import android.util.Log; | ||
| import android.widget.Toast; | ||
|
|
||
| import java.util.Stack; | ||
|
|
||
| import androidx.core.app.NotificationManagerCompat; | ||
|
|
||
| import com.facebook.react.bridge.Promise; | ||
| import com.facebook.react.bridge.ReactApplicationContext; | ||
| import com.facebook.react.bridge.ReactContextBaseJavaModule; | ||
| import com.facebook.react.bridge.ReactMethod; | ||
| import com.reactnativecommunity.asyncstorage.AsyncLocalStorageUtil; | ||
| import com.reactnativecommunity.asyncstorage.ReactDatabaseSupplier; | ||
|
|
||
| import org.torproject.jni.TorService; | ||
|
|
||
|
|
||
| public class BlixtTor extends ReactContextBaseJavaModule { | ||
| static private final String TAG = "BlixtTor"; | ||
| static TorService torService; | ||
| static String currentTorStatus = TorService.STATUS_OFF; | ||
| static Stack<Promise> calleeResolvers = new Stack<>(); | ||
| static NotificationManagerCompat notificationManager; | ||
|
|
||
| static private boolean getPersistentServicesEnabled(Context context) { | ||
| ReactDatabaseSupplier dbSupplier = ReactDatabaseSupplier.getInstance(context); | ||
| SQLiteDatabase db = dbSupplier.get(); | ||
| String persistentServicesEnabled = AsyncLocalStorageUtil.getItemImpl(db, "persistentServicesEnabled"); | ||
| if (persistentServicesEnabled != null) { | ||
| return persistentServicesEnabled.equals("true"); | ||
| } | ||
| Log.w(TAG, "Could not find persistentServicesEnabled in asyncStorage"); | ||
| return false; | ||
| } | ||
|
|
||
| static private final ServiceConnection torServiceConnection = new ServiceConnection() { | ||
| @Override | ||
| public void onServiceConnected(ComponentName className, IBinder service) { | ||
| // We've bound to LocalService, cast the IBinder and get LocalService instance | ||
| TorService.LocalBinder binder = (TorService.LocalBinder) service; | ||
| torService = binder.getService(); | ||
| Log.i(TAG, "torService.getService()"); | ||
| boolean persistentServicesEnabled = getPersistentServicesEnabled(torService); | ||
| if (persistentServicesEnabled) { | ||
| torService.startForeground(0xc0feefee, getNotification(torService)); | ||
| } | ||
| Log.i(TAG, "onServiceConnected"); | ||
| } | ||
|
|
||
| @Override | ||
| public void onServiceDisconnected(ComponentName arg0) { | ||
| Log.i(TAG, "onServiceDisconnected"); | ||
| } | ||
|
|
||
| public Notification getNotification(Context context) { | ||
| Intent notificationIntent = new Intent (context, MainActivity.class); | ||
| PendingIntent pendingIntent = | ||
| PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE); | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { | ||
| NotificationChannel channel = new NotificationChannel(BuildConfig.APPLICATION_ID, "blixt", NotificationManager.IMPORTANCE_NONE); | ||
| channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE); | ||
| notificationManager = NotificationManagerCompat.from(context); | ||
| notificationManager.createNotificationChannel(channel); | ||
| notificationManager.createNotificationChannel(channel); | ||
| } | ||
| return new Notification.Builder(context, BuildConfig.APPLICATION_ID) | ||
| .setContentTitle("Tor") | ||
| .setContentText("Tor is running in the background") | ||
| .setSmallIcon(R.drawable.ic_stat_ic_notification) | ||
| .setContentIntent(pendingIntent) | ||
| .setTicker("Blixt Wallet") | ||
| .setOngoing(true) | ||
| .build(); | ||
| } | ||
| }; | ||
|
|
||
| private final BroadcastReceiver torBroadcastReceiver = new BroadcastReceiver() { | ||
| @Override | ||
| public void onReceive(Context context, Intent intent) { | ||
| // Toast.makeText(context, intent.getStringExtra(TorService.EXTRA_STATUS), Toast.LENGTH_SHORT).show(); | ||
| String status = intent.getStringExtra(TorService.EXTRA_STATUS); | ||
| if (intent != null && intent.getAction() != null && intent.getAction().equals("org.torproject.android.intent.action.STOP")) { | ||
| torService.stopSelf(); | ||
| } | ||
| currentTorStatus = status; | ||
| Log.i(TAG, "onReceive " + status); | ||
| if (status.equals(TorService.STATUS_ON)) { | ||
| while (calleeResolvers.size() > 0) { | ||
| calleeResolvers.pop().resolve(TorService.socksPort); | ||
| } | ||
| } else if (status.equals(TorService.STATUS_OFF)) { | ||
| getReactApplicationContext().unregisterReceiver(torBroadcastReceiver); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| public BlixtTor(ReactApplicationContext reactContext) { | ||
| super(reactContext); | ||
| } | ||
|
|
||
| public String getName() { | ||
| return "BlixtTor"; | ||
| } | ||
|
|
||
| @ReactMethod | ||
| public void startTor(Promise promise) { | ||
| Log.i(TAG, "startTor()"); | ||
| // if (calleeResolver != null) { | ||
| // Log.i(TAG, "calleeResolver != null"); | ||
| // promise.reject(TAG, "Tor already in progress starting"); | ||
| // return; | ||
| // } | ||
| if (currentTorStatus.equals(TorService.STATUS_ON)) { | ||
| Log.i(TAG, "socksPort = " + TorService.socksPort + ", currentTorStatus.equals(TorService.STATUS_ON) " + currentTorStatus.equals(TorService.STATUS_ON)); | ||
| promise.resolve(TorService.socksPort); | ||
| return; | ||
| } | ||
| calleeResolvers.add(promise); | ||
|
|
||
| boolean persistentServicesEnabled = getPersistentServicesEnabled(getReactApplicationContext()); | ||
| getReactApplicationContext().registerReceiver(torBroadcastReceiver, new IntentFilter(TorService.ACTION_STATUS)); | ||
| Intent intent = new Intent(getReactApplicationContext(), TorService.class); | ||
|
|
||
| if (persistentServicesEnabled) { | ||
| getReactApplicationContext().startForegroundService(intent); | ||
| } | ||
| getReactApplicationContext().bindService(intent, torServiceConnection, Context.BIND_AUTO_CREATE); | ||
| } | ||
|
|
||
| @ReactMethod | ||
| public void stopTor(Promise promise) { | ||
| if (notificationManager != null) { | ||
| notificationManager.cancelAll(); | ||
| } | ||
| Log.i(TAG,"Unbinding TorService"); | ||
| try { | ||
| getReactApplicationContext().unbindService(torServiceConnection); | ||
| } catch (IllegalArgumentException e) { | ||
| Log.w(TAG, "Tried to unbindService on unbound service"); | ||
| } | ||
| promise.resolve(true); | ||
| }; | ||
|
|
||
| @ReactMethod | ||
| public void showMsg(Promise promise) { | ||
| MainActivity.getActivity().showMsg(); | ||
| promise.resolve(true); | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
android/app/src/main/java/com/blixtwallet/BlixtTorPackage.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,22 @@ | ||
| package com.blixtwallet; | ||
|
|
||
| import com.facebook.react.ReactPackage; | ||
| import com.facebook.react.bridge.NativeModule; | ||
| import com.facebook.react.bridge.ReactApplicationContext; | ||
| import com.facebook.react.uimanager.ViewManager; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| public class BlixtTorPackage implements ReactPackage { | ||
| @Override | ||
| public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) { | ||
| return Collections.emptyList(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) { | ||
| return Arrays.asList(new BlixtTor(reactContext)); | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
android/app/src/main/java/com/blixtwallet/BlixtTorUtils.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,16 @@ | ||
| package com.blixtwallet; | ||
|
|
||
| import com.blixtwallet.BuildConfig; | ||
|
|
||
| public class BlixtTorUtils { | ||
| public static int getListenPort() { | ||
| int listenPort = 9760; | ||
| if (BuildConfig.CHAIN.equals("testnet")) { | ||
| listenPort += 10; | ||
| } | ||
| if (BuildConfig.DEBUG) { | ||
| listenPort += 100; | ||
| } | ||
| return listenPort; | ||
| } | ||
| } |
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
15 changes: 0 additions & 15 deletions
15
android/app/src/main/java/com/blixtwallet/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.
e26c5bcThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs:
blixt-wallet – ./
blixt-wallet-git-master-hsjoberg.vercel.app
blixt-wallet-hsjoberg.vercel.app