Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Wallet
sentinel-android
Commits
c964a85b
Commit
c964a85b
authored
Aug 27, 2020
by
T Dev. D
😎
Browse files
Merge branch 'tor' of
https://github.com/Samourai-Wallet/sentinel-android
into tor
parents
56ddd643
c1a694e1
Changes
109
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
58 additions
and
54 deletions
+58
-54
app/build.gradle
app/build.gradle
+13
-11
app/src/main/AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-0
app/src/main/java/com/samourai/sentinel/BalanceActivity.java
app/src/main/java/com/samourai/sentinel/BalanceActivity.java
+4
-3
app/src/main/java/com/samourai/sentinel/InsertActivity.java
app/src/main/java/com/samourai/sentinel/InsertActivity.java
+1
-1
app/src/main/java/com/samourai/sentinel/MainActivity.java
app/src/main/java/com/samourai/sentinel/MainActivity.java
+3
-2
app/src/main/java/com/samourai/sentinel/MainActivity2.java
app/src/main/java/com/samourai/sentinel/MainActivity2.java
+2
-3
app/src/main/java/com/samourai/sentinel/ReceiveActivity.java
app/src/main/java/com/samourai/sentinel/ReceiveActivity.java
+3
-3
app/src/main/java/com/samourai/sentinel/SentinelApplication.java
.../main/java/com/samourai/sentinel/SentinelApplication.java
+1
-2
app/src/main/java/com/samourai/sentinel/ShowQRActivity.java
app/src/main/java/com/samourai/sentinel/ShowQRActivity.java
+1
-1
app/src/main/java/com/samourai/sentinel/XPUBListActivity.java
...src/main/java/com/samourai/sentinel/XPUBListActivity.java
+1
-1
app/src/main/java/com/samourai/sentinel/codescanner/BarcodeUtils.java
.../java/com/samourai/sentinel/codescanner/BarcodeUtils.java
+3
-3
app/src/main/java/com/samourai/sentinel/codescanner/CameraFragmentBottomSheet.java
...ourai/sentinel/codescanner/CameraFragmentBottomSheet.java
+4
-3
app/src/main/java/com/samourai/sentinel/codescanner/CodeScanner.java
...n/java/com/samourai/sentinel/codescanner/CodeScanner.java
+3
-3
app/src/main/java/com/samourai/sentinel/codescanner/CodeScannerException.java
...m/samourai/sentinel/codescanner/CodeScannerException.java
+2
-2
app/src/main/java/com/samourai/sentinel/codescanner/CodeScannerView.java
...va/com/samourai/sentinel/codescanner/CodeScannerView.java
+7
-7
app/src/main/java/com/samourai/sentinel/codescanner/DecodeCallback.java
...ava/com/samourai/sentinel/codescanner/DecodeCallback.java
+2
-2
app/src/main/java/com/samourai/sentinel/codescanner/DecodeTask.java
...in/java/com/samourai/sentinel/codescanner/DecodeTask.java
+2
-2
app/src/main/java/com/samourai/sentinel/codescanner/Decoder.java
.../main/java/com/samourai/sentinel/codescanner/Decoder.java
+2
-2
app/src/main/java/com/samourai/sentinel/codescanner/DecoderWrapper.java
...ava/com/samourai/sentinel/codescanner/DecoderWrapper.java
+1
-1
app/src/main/java/com/samourai/sentinel/codescanner/ErrorCallback.java
...java/com/samourai/sentinel/codescanner/ErrorCallback.java
+2
-2
No files found.
app/build.gradle
View file @
c964a85b
apply
plugin:
'com.android.application'
android
{
compileSdkVersion
2
8
buildToolsVersion
'28
.0.3
'
compileSdkVersion
2
9
buildToolsVersion
"29
.0.3
"
flavorDimensions
"versionCode"
defaultConfig
{
applicationId
"com.samourai.sentinel"
minSdkVersion
21
targetSdkVersion
2
8
targetSdkVersion
2
9
versionCode
49
versionName
'3.6'
multiDexEnabled
true
...
...
@@ -44,7 +44,7 @@ android {
production
{
minSdkVersion
21
applicationId
'com.samourai.sentinel'
targetSdkVersion
2
8
targetSdkVersion
2
9
versionCode
49
versionName
'3.6'
resValue
"string"
,
"app_name"
,
"Sentinel"
...
...
@@ -53,7 +53,7 @@ android {
staging
{
minSdkVersion
21
applicationId
'com.samourai.sentinel.staging'
targetSdkVersion
2
8
targetSdkVersion
2
9
versionCode
50
versionName
'3.7'
resValue
"string"
,
"app_name"
,
"Sentinel Staging"
...
...
@@ -68,9 +68,9 @@ android {
dependencies
{
api
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
implementation
'
com.
android
.support
:multidex:
1
.0.
3
'
implementation
'
com.
android
.support:
support-v4:
28
.0.0'
implementation
'
com.
android
.suppor
t:appcompat
-v7:28.0
.0'
implementation
'android
x.multidex
:multidex:
2
.0.
1
'
implementation
'android
x.legacy:legacy-
support-v4:
1
.0.0'
implementation
'android
x.appcompa
t:appcompat
:1.2
.0'
implementation
'com.baoyz.swipemenulistview:library:1.2.1'
implementation
'com.neovisionaries:nv-websocket-client:1.9'
implementation
'commons-codec:commons-codec:1.4'
...
...
@@ -81,19 +81,21 @@ dependencies {
implementation
'com.lambdaworks:scrypt:1.4.0'
implementation
'net.i2p.android.ext:floatingactionbutton:1.9.0'
implementation
'com.squareup.picasso:picasso:2.5.2'
implementation
'com.android.
support:design:28.0
.0'
implementation
'com.
google.
android.
material:material:1.2
.0'
implementation
(
'com.google.zxing:core:3.3.0'
)
{
transitive
=
true
}
implementation
'androidx.appcompat:appcompat:1.2.0'
implementation
'com.yanzhenjie.zbar:camera:1.0.0'
implementation
'io.reactivex.rxjava2:rxandroid:2.1.0'
implementation
'com.auth0.android:jwtdecode:1.1.1'
implementation
'com.squareup.okhttp3:okhttp:3.13.1'
implementation
'com.squareup.okhttp3:logging-interceptor:3.9.1'
implementation
project
(
path:
':tor'
)
implementation
project
(
path:
':tor
service
'
)
implementation
'
com.
android
.support
.constraint:constraint
-
layout:1.1.3'
implementation
'android
x
.constraint
layout
:constraintlayout:1.1.3'
}
...
...
app/src/main/AndroidManifest.xml
View file @
c964a85b
...
...
@@ -22,6 +22,7 @@
android:allowBackup=
"false"
android:usesCleartextTraffic=
"true"
android:name=
".SentinelApplication"
tools:replace=
"android:allowBackup"
tools:ignore=
"GoogleAppIndexingWarning"
>
<service
android:name=
".tor.TorService"
...
...
app/src/main/java/com/samourai/sentinel/BalanceActivity.java
View file @
c964a85b
...
...
@@ -16,9 +16,10 @@ import android.net.Uri;
import
android.os.Bundle
;
import
android.os.Handler
;
import
android.os.Looper
;
import
android.support.v4.content.LocalBroadcastManager
;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.app.AppCompatActivity
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.localbroadcastmanager.content.LocalBroadcastManager
;
import
androidx.swiperefreshlayout.widget.SwipeRefreshLayout
;
import
android.text.InputType
;
import
android.util.Log
;
import
android.view.KeyEvent
;
...
...
app/src/main/java/com/samourai/sentinel/InsertActivity.java
View file @
c964a85b
...
...
@@ -5,7 +5,7 @@ import android.app.AlertDialog;
import
android.content.DialogInterface
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android
.support.v7
.app.AppCompatActivity
;
import
android
x.appcompat
.app.AppCompatActivity
;
import
android.util.Log
;
import
android.view.MenuItem
;
import
android.view.MotionEvent
;
...
...
app/src/main/java/com/samourai/sentinel/MainActivity.java
View file @
c964a85b
...
...
@@ -7,6 +7,7 @@ import android.content.Intent;
import
android.os.Bundle
;
import
android.widget.TextView
;
import
com.invertedx.torservice.TorProxyManager
;
import
com.samourai.sentinel.tor.TorManager
;
import
com.samourai.sentinel.util.AppUtil
;
import
com.samourai.sentinel.util.ConnectivityStatus
;
...
...
@@ -44,11 +45,11 @@ public class MainActivity extends Activity {
if
(
ConnectivityStatus
.
hasConnectivity
(
getApplicationContext
())
&&
PrefsUtil
.
getInstance
(
getApplicationContext
()).
getValue
(
PrefsUtil
.
ENABLE_TOR
,
false
))
{
loaderTxView
.
setText
(
getText
(
R
.
string
.
initializing_tor
));
Disposable
disposable
=
TorManager
.
getInstance
(
getApplicationContext
())
.
t
orStatus
.
getT
orStatus
()
.
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
(
connection_states
->
{
if
(
connection_states
==
TorManager
.
C
ONNECTION_STATES
.
CONNECTED
)
{
if
(
connection_states
==
Tor
Proxy
Manager
.
C
onnectionStatus
.
CONNECTED
)
{
doMain
();
compositeDisposables
.
dispose
();
}
...
...
app/src/main/java/com/samourai/sentinel/MainActivity2.java
View file @
c964a85b
...
...
@@ -9,12 +9,11 @@ import android.os.Build;
import
android.os.Bundle
;
import
android.os.Handler
;
import
android.os.Looper
;
import
android.support.v4.content.LocalBroadcastManager
;
import
android.view.KeyEvent
;
import
android.widget.Toast
;
//import android.util.Log;
import
com.samourai.sentinel.access.AccessFactory
;
import
androidx.localbroadcastmanager.content.LocalBroadcastManager
;
import
com.samourai.sentinel.api.APIFactory
;
import
com.samourai.sentinel.service.BackgroundManager
;
import
com.samourai.sentinel.service.WebSocketService
;
...
...
app/src/main/java/com/samourai/sentinel/ReceiveActivity.java
View file @
c964a85b
...
...
@@ -14,11 +14,11 @@ import android.graphics.drawable.BitmapDrawable;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.os.Handler
;
import
android.support.v4.content.FileProvider
;
import
android.support.v4.content.LocalBroadcastManager
;
import
androidx.core.content.FileProvider
;
import
androidx.localbroadcastmanager.content.LocalBroadcastManager
;
import
android.text.Editable
;
import
android.text.TextWatcher
;
import
android.util.Log
;
import
android.view.Display
;
import
android.view.Menu
;
import
android.view.MenuItem
;
...
...
app/src/main/java/com/samourai/sentinel/SentinelApplication.java
View file @
c964a85b
package
com.samourai.sentinel
;
import
android.app.Application
;
import
android.app.Notification
;
import
android.app.NotificationChannel
;
import
android.app.NotificationManager
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.os.Build
;
import
android
.support
.multidex.MultiDex
;
import
android
x
.multidex.MultiDex
;
import
com.samourai.sentinel.tor.TorService
;
import
com.samourai.sentinel.util.ConnectivityStatus
;
...
...
app/src/main/java/com/samourai/sentinel/ShowQRActivity.java
View file @
c964a85b
...
...
@@ -10,7 +10,7 @@ import android.graphics.Point;
import
android.graphics.drawable.BitmapDrawable
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android
.support.v4
.content.FileProvider
;
import
android
x.core
.content.FileProvider
;
import
android.view.Display
;
import
android.view.Menu
;
import
android.view.MenuItem
;
...
...
app/src/main/java/com/samourai/sentinel/XPUBListActivity.java
View file @
c964a85b
...
...
@@ -7,7 +7,7 @@ import android.content.Intent;
import
android.graphics.Color
;
import
android.graphics.drawable.ColorDrawable
;
import
android.os.Bundle
;
import
android
.support.v7
.app.AppCompatActivity
;
import
android
x.appcompat
.app.AppCompatActivity
;
import
android.text.Spannable
;
import
android.text.SpannableStringBuilder
;
import
android.util.Pair
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/BarcodeUtils.java
View file @
c964a85b
...
...
@@ -25,9 +25,9 @@ package com.samourai.sentinel.codescanner;
import
android.graphics.Bitmap
;
import
android.graphics.Color
;
import
android
.support
.annotation.IntDef
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.IntDef
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.Nullable
;
import
com.google.zxing.BarcodeFormat
;
import
com.google.zxing.DecodeHintType
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/CameraFragmentBottomSheet.java
View file @
c964a85b
package
com.samourai.sentinel.codescanner
;
import
android.os.Bundle
;
import
android.support.design.widget.BottomSheetBehavior
;
import
android.support.design.widget.BottomSheetDialogFragment
;
import
android.support.design.widget.CoordinatorLayout
;
import
com.google.android.material.bottomsheet.BottomSheetBehavior
;
import
com.google.android.material.bottomsheet.BottomSheetDialogFragment
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
androidx.coordinatorlayout.widget.CoordinatorLayout
;
import
com.samourai.sentinel.R
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/CodeScanner.java
View file @
c964a85b
...
...
@@ -10,9 +10,9 @@ import android.hardware.Camera.CameraInfo;
import
android.hardware.Camera.Parameters
;
import
android.os.Handler
;
import
android.os.Process
;
import
android
.support
.annotation.MainThread
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.MainThread
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.Nullable
;
import
android.view.SurfaceHolder
;
import
com.google.zxing.BarcodeFormat
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/CodeScannerException.java
View file @
c964a85b
...
...
@@ -24,8 +24,8 @@
package
com.samourai.sentinel.codescanner
;
import
android.os.Build
;
import
android
.support
.annotation.Nullable
;
import
android
.support
.annotation.RequiresApi
;
import
android
x
.annotation.Nullable
;
import
android
x
.annotation.RequiresApi
;
/**
* Common class for code scanner runtime exceptions
...
...
app/src/main/java/com/samourai/sentinel/codescanner/CodeScannerView.java
View file @
c964a85b
...
...
@@ -28,13 +28,13 @@ import android.content.Context;
import
android.content.res.TypedArray
;
import
android.graphics.Color
;
import
android.os.Build
;
import
android
.support
.annotation.AttrRes
;
import
android
.support
.annotation.ColorInt
;
import
android
.support
.annotation.FloatRange
;
import
android
.support
.annotation.Nullable
;
import
android
.support
.annotation.Px
;
import
android
.support
.annotation.RequiresApi
;
import
android
.support
.annotation.StyleRes
;
import
android
x
.annotation.AttrRes
;
import
android
x
.annotation.ColorInt
;
import
android
x
.annotation.FloatRange
;
import
android
x
.annotation.Nullable
;
import
android
x
.annotation.Px
;
import
android
x
.annotation.RequiresApi
;
import
android
x
.annotation.StyleRes
;
import
android.util.AttributeSet
;
import
android.view.MotionEvent
;
import
android.view.SurfaceView
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/DecodeCallback.java
View file @
c964a85b
...
...
@@ -26,8 +26,8 @@ package com.samourai.sentinel.codescanner;
import
android.app.Activity
;
import
android.os.Handler
;
import
android.os.Looper
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.WorkerThread
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.WorkerThread
;
import
com.google.zxing.Result
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/DecodeTask.java
View file @
c964a85b
...
...
@@ -23,8 +23,8 @@
*/
package
com.samourai.sentinel.codescanner
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.Nullable
;
import
com.google.zxing.MultiFormatReader
;
import
com.google.zxing.PlanarYUVLuminanceSource
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/Decoder.java
View file @
c964a85b
...
...
@@ -24,8 +24,8 @@
package
com.samourai.sentinel.codescanner
;
import
android.os.Process
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.Nullable
;
import
com.google.zxing.BarcodeFormat
;
import
com.google.zxing.DecodeHintType
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/DecoderWrapper.java
View file @
c964a85b
...
...
@@ -24,7 +24,7 @@
package
com.samourai.sentinel.codescanner
;
import
android.hardware.Camera
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
final
class
DecoderWrapper
{
...
...
app/src/main/java/com/samourai/sentinel/codescanner/ErrorCallback.java
View file @
c964a85b
...
...
@@ -26,8 +26,8 @@ package com.samourai.sentinel.codescanner;
import
android.app.Activity
;
import
android.os.Handler
;
import
android.os.Looper
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.WorkerThread
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.WorkerThread
;
/**
...
...
Prev
1
2
3
4
5
6
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment