From 6f4a3d6e2285803c66207af63d5f4d50b66ef21e Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Fri, 8 Sep 2023 18:30:23 +0530 Subject: [PATCH] =?UTF-8?q?TP-00000=20|=20Master=20=E2=86=92=20Development?= =?UTF-8?q?=20(Release=204.0.8)=20(#7826)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- navi-base/src/main/cpp/CMakeLists.txt | 24 ------------------- .../interceptor/EncryptionHashInterceptor.kt | 14 +---------- 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a5adc1ee34..40f82ab9ae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ kapt { correctErrorTypes true } -def VERSION_CODE = 344 -def VERSION_NAME = "4.0.7" +def VERSION_CODE = 345 +def VERSION_NAME = "4.0.8" android { namespace 'com.naviapp' diff --git a/navi-base/src/main/cpp/CMakeLists.txt b/navi-base/src/main/cpp/CMakeLists.txt index b4c1a759ab..fc530ea5fd 100644 --- a/navi-base/src/main/cpp/CMakeLists.txt +++ b/navi-base/src/main/cpp/CMakeLists.txt @@ -24,27 +24,3 @@ add_library( # Sets the name of the library. # Provides a relative path to your source file(s). navi-lib.cpp) -# Searches for a specified prebuilt library and stores the path as a -# variable. Because CMake includes system libraries in the search path by -# default, you only need to specify the name of the public NDK library -# you want to add. CMake verifies that the library exists before -# completing its build. - -find_library( # Sets the name of the path variable. - log-lib - - # Specifies the name of the NDK library that - # you want CMake to locate. - log) - -# Specifies libraries CMake should link to your target library. You -# can link multiple libraries, such as libraries you define in this -# build script, prebuilt third-party libraries, or system libraries. - -target_link_libraries( # Specifies the target library. - navi-lib - - # Links the target library to the log library - # included in the NDK. - ${log-lib}) - diff --git a/navi-base/src/main/java/com/navi/base/security/interceptor/EncryptionHashInterceptor.kt b/navi-base/src/main/java/com/navi/base/security/interceptor/EncryptionHashInterceptor.kt index 8a17e7bf76..2d1c7fb517 100644 --- a/navi-base/src/main/java/com/navi/base/security/interceptor/EncryptionHashInterceptor.kt +++ b/navi-base/src/main/java/com/navi/base/security/interceptor/EncryptionHashInterceptor.kt @@ -8,7 +8,6 @@ package com.navi.base.security.interceptor import android.content.Context -import com.google.android.play.core.splitinstall.SplitInstallHelper import com.navi.base.network.util.ApiConstants.API_CODE_ERROR import com.navi.base.security.AlgorithmKeyEnum import com.navi.base.security.AppKeyHelper @@ -21,7 +20,6 @@ import okhttp3.Protocol import okhttp3.Response import okhttp3.ResponseBody import okio.Buffer -import java.lang.Error /** * Interceptor to add encryption hash to the request. @@ -31,17 +29,7 @@ import java.lang.Error class EncryptionHashInterceptor(private val context: Context) : Interceptor { init { - val naviNativeLibraryName = "navi-lib" - - try { - System.loadLibrary(naviNativeLibraryName) - } catch (_: Error) { - try { - SplitInstallHelper.loadLibrary(context, naviNativeLibraryName) - } catch (_: Error) { - // Ignore - } - } + System.loadLibrary("navi-lib") } override fun intercept(chain: Interceptor.Chain): Response {