Browse Source

[New]新增接口加密

zhipeng 4 months ago
parent
commit
821a02a0ed

+ 8 - 1
app/src/main/java/com/datarecovery/master/di/NetworkModule.java

@@ -1,5 +1,6 @@
 package com.datarecovery.master.di;
 package com.datarecovery.master.di;
 
 
+import com.atmob.network.interceptor.crypto.AtmobCryptoInterceptor;
 import com.atmob.network.okhttp.AtmobOkHttpClient;
 import com.atmob.network.okhttp.AtmobOkHttpClient;
 import com.datarecovery.master.BuildConfig;
 import com.datarecovery.master.BuildConfig;
 import com.datarecovery.master.data.api.AtmobApi;
 import com.datarecovery.master.data.api.AtmobApi;
@@ -25,7 +26,13 @@ public class NetworkModule {
     @Singleton
     @Singleton
     @Provides
     @Provides
     public static AtmobApi provideAtmobApi(Gson gson) {
     public static AtmobApi provideAtmobApi(Gson gson) {
-        OkHttpClient okHttpClient = AtmobOkHttpClient.newInstance(ATMOB_TAG, BuildConfig.DEBUG);
+        OkHttpClient okHttpClient = AtmobOkHttpClient.newInstance(ATMOB_TAG, BuildConfig.DEBUG)
+                .newBuilder()
+                .addInterceptor(new AtmobCryptoInterceptor.Builder()
+                        .appKey(BuildConfig.ATMOB_CENTRAL_KEY)
+                        .setCryptoVersion(AtmobCryptoInterceptor.Version.V1)
+                        .build())
+                .build();
         return new Retrofit.Builder()
         return new Retrofit.Builder()
                 .client(okHttpClient)
                 .client(okHttpClient)
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .addConverterFactory(GsonConverterFactory.create(gson))

+ 3 - 1
app/src/main/java/com/datarecovery/master/utils/ImageDeepDetector.java

@@ -11,6 +11,7 @@ import android.os.CancellationSignal;
 import android.os.Environment;
 import android.os.Environment;
 import android.os.PowerManager;
 import android.os.PowerManager;
 import android.text.TextUtils;
 import android.text.TextUtils;
+import android.util.Log;
 
 
 import androidx.databinding.BaseObservable;
 import androidx.databinding.BaseObservable;
 import androidx.databinding.Bindable;
 import androidx.databinding.Bindable;
@@ -401,7 +402,8 @@ public class ImageDeepDetector {
 
 
     private static boolean hasImgMagic(XFile file) {
     private static boolean hasImgMagic(XFile file) {
         try {
         try {
-            if (file.getMineType() != null && !file.getMineType().equals("application/octet-stream")) {
+            if (file.getMineType() != null && !file.getMineType().equals("application/octet-stream")
+                    && !file.getMineType().contains("image") && !file.getMineType().equals("chemical/x-cache")) {
                 return false;
                 return false;
             }
             }
         } catch (Exception ignore) {
         } catch (Exception ignore) {

+ 2 - 2
build.gradle

@@ -6,8 +6,8 @@ buildscript {
         minSdkVersion = 21
         minSdkVersion = 21
         targetSdkVersion = 32
         targetSdkVersion = 32
 
 
-        versionCode = 123
-        versionName = "1.2.3"
+        versionCode = 124
+        versionName = "1.2.4"
 
 
         hilt_version = '2.41'
         hilt_version = '2.41'
         lifecycle_version = "2.6.1"
         lifecycle_version = "2.6.1"