Commit c964a85b authored by T Dev. D's avatar T Dev. D 😎
Browse files
parents 56ddd643 c1a694e1
apply plugin: 'com.android.application'
android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 29
buildToolsVersion "29.0.3"
flavorDimensions "versionCode"
defaultConfig {
applicationId "com.samourai.sentinel"
minSdkVersion 21
targetSdkVersion 28
targetSdkVersion 29
versionCode 49
versionName '3.6'
multiDexEnabled true
......@@ -44,7 +44,7 @@ android {
production {
minSdkVersion 21
applicationId 'com.samourai.sentinel'
targetSdkVersion 28
targetSdkVersion 29
versionCode 49
versionName '3.6'
resValue "string", "app_name", "Sentinel"
......@@ -53,7 +53,7 @@ android {
staging {
minSdkVersion 21
applicationId 'com.samourai.sentinel.staging'
targetSdkVersion 28
targetSdkVersion 29
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.support:appcompat-v7:28.0.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat: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: ':torservice')
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
}
......
......@@ -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"
......
......@@ -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;
......
......@@ -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 androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.view.MenuItem;
import android.view.MotionEvent;
......
......@@ -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())
.torStatus
.getTorStatus()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(connection_states -> {
if (connection_states == TorManager.CONNECTION_STATES.CONNECTED) {
if (connection_states == TorProxyManager.ConnectionStatus.CONNECTED) {
doMain();
compositeDisposables.dispose();
}
......
......@@ -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;
......
......@@ -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;
......
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 androidx.multidex.MultiDex;
import com.samourai.sentinel.tor.TorService;
import com.samourai.sentinel.util.ConnectivityStatus;
......
......@@ -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 androidx.core.content.FileProvider;
import android.view.Display;
import android.view.Menu;
import android.view.MenuItem;
......
......@@ -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 androidx.appcompat.app.AppCompatActivity;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.util.Pair;
......
......@@ -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 androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.DecodeHintType;
......
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;
......
......@@ -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 androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.view.SurfaceHolder;
import com.google.zxing.BarcodeFormat;
......
......@@ -24,8 +24,8 @@
package com.samourai.sentinel.codescanner;
import android.os.Build;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
/**
* Common class for code scanner runtime exceptions
......
......@@ -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 androidx.annotation.AttrRes;
import androidx.annotation.ColorInt;
import androidx.annotation.FloatRange;
import androidx.annotation.Nullable;
import androidx.annotation.Px;
import androidx.annotation.RequiresApi;
import androidx.annotation.StyleRes;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.SurfaceView;
......
......@@ -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 androidx.annotation.NonNull;
import androidx.annotation.WorkerThread;
import com.google.zxing.Result;
......
......@@ -23,8 +23,8 @@
*/
package com.samourai.sentinel.codescanner;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.zxing.MultiFormatReader;
import com.google.zxing.PlanarYUVLuminanceSource;
......
......@@ -24,8 +24,8 @@
package com.samourai.sentinel.codescanner;
import android.os.Process;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.DecodeHintType;
......
......@@ -24,7 +24,7 @@
package com.samourai.sentinel.codescanner;
import android.hardware.Camera;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
final class DecoderWrapper {
......
......@@ -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 androidx.annotation.NonNull;
import androidx.annotation.WorkerThread;
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment