From 6ed9e48388fb0e6006187c6317c4e35227385c3d Mon Sep 17 00:00:00 2001 From: Mukesh Dhungana Date: Tue, 8 Mar 2022 19:24:30 +0545 Subject: [PATCH] add new config settings and fix few package issues --- app/build.gradle | 24 ++++++---- app/proguard-rules.pro | 9 ++-- app/src/main/AndroidManifest.xml | 2 +- .../jmecustomer/base/PrivilegedGateway.java | 4 +- .../jmecustomer/utils/https/HttpClientV2.java | 3 +- app/src/main/res/layout/activity_settings.xml | 43 +++++++++--------- keystores/JmeKeyStores/upload-keystore.jks | Bin 0 -> 2637 bytes 7 files changed, 48 insertions(+), 37 deletions(-) create mode 100644 keystores/JmeKeyStores/upload-keystore.jks diff --git a/app/build.gradle b/app/build.gradle index cc67b76d..1299054a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,11 +33,11 @@ android { signingConfigs { release { - keyAlias 'GmeRemitKey' - keyPassword 'GmeRemit@1010' - keyPassword 'GmeRemit@1010' - storeFile file('../storekeys/GmeStoreKeys') - storePassword 'GmeRemit@1010' + keyAlias 'JME Remit Key' + keyPassword 'Jme@androidKey23#' + keyPassword 'Jme@androidKey23#' + storeFile file('../keystores/JmeKeyStores/upload-keystore.jks') + storePassword 'Jme@androidKey23#' } stag { keyAlias 'JPT' @@ -48,13 +48,18 @@ android { } buildTypes { release { - buildConfigField 'String', 'BASE_URL', '"https://mobileapi.gmeremit.com:8002/api/"' + buildConfigField 'String', 'BASE_URL', '"https://mobile.japanremit.com:8443/api/"' buildConfigField 'String', 'API_VERSION', '"v1"' buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"' + buildConfigField 'String', 'GME_TOKEN', '"@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp"' + buildConfigField 'String', 'ClientId', '"5220224461B37738C528430"' + buildConfigField 'String', 'SecretKey', '"VkYp3s6v"' debuggable false - minifyEnabled false - shrinkResources false + minifyEnabled true + shrinkResources true + useProguard true // obfuscate proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release } livedebug { @@ -99,6 +104,9 @@ android { buildConfigField 'String', 'BASE_URL', '"http://202.166.220.36:8083/api/"' buildConfigField 'String', 'API_VERSION', '"v1"' buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"' + buildConfigField 'String', 'GME_TOKEN', '"39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru"' + buildConfigField 'String', 'ClientId', '"172017F9EC11222E8107142733"' + buildConfigField 'String', 'SecretKey', '"QRK2UM0Q"' debuggable true minifyEnabled false shrinkResources false diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index a58fde13..f6e6ab96 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -61,7 +61,7 @@ -keep class org.apache.xml.security.utils.** { *; } -dontwarn org.apache.xml.security.utils.** --keep class javax.xml.crypto.XMLStructure +-keep class javax.xml.crypto.XMLStructure.** { *; } -dontwarn javax.xml.crypto.XMLStructure #joda time @@ -78,18 +78,19 @@ -dontnote okhttp3.** # Okio --keep class sun.misc.Unsafe { *; } +-keep class sun.misc.Unsafe.** { *; } -dontwarn java.nio.file.* -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement -keepattributes *Annotation* -keepclassmembers class ** { - @org.greenrobot.eventbus.Subscribe ; + *; } --keep enum org.greenrobot.eventbus.ThreadMode { *; } +-keep enum org.greenrobot.eventbus.ThreadMode.** { *; } # Only required if you use AsyncExecutor +#noinspection ShrinkerUnresolvedReference -keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent { (java.lang.Throwable); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 70032914..53939c57 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ { Request newRequest = chain.request().newBuilder() - .addHeader("GME-TOKEN", "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru") + //.addHeader("GME-TOKEN", "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru") + .addHeader("GME-TOKEN", BuildConfig.GME_TOKEN) .addHeader("lang", RemitApplication.getPreferredCountryCode().toLowerCase()) .build(); return chain.proceed(newRequest); diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index e5dd6c50..f48e52d5 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -54,23 +54,23 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingLeft="52dp" android:paddingStart="52dp" + android:paddingLeft="52dp" android:paddingTop="14dp"> - + @@ -95,41 +95,40 @@ android:layout_height="1dp" android:background="@color/divider_dark" /> - - - diff --git a/keystores/JmeKeyStores/upload-keystore.jks b/keystores/JmeKeyStores/upload-keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..60c2146857c023faabf29064c95440fd8cba0672 GIT binary patch literal 2637 zcmY+Ec{mgb7sh9%nPDuAP+3M85s}8eg^+MvvTtKwuCdJ6Wtr#>O+#@Lnlu=)M3(G( zmV^|VLiU}wjF4sQuJ3!k``zdMan5<4_dVzQ`9l#{3_!p$C;|%z3cE_wCopVb60XZ%I*w?$5Aig>+pf?R<(lyi^wqDB z)DI0n9WIu*;V4vyZ;yv|`dAt)XZ_CwtD^^V>w~QU*IUEh`fZX7yiQg$!s8tDSt7~! zGA>asIg)P@7xKBCiA|kw;Qp$Qjzy#C@pX=VaVd28dcq* zEtuze%DP^|Vm2yf{Ksxoyw#B>t_;~~RZ`?(CAb!&@(@wxC+O`%t*OXf!n4x(!Q zYOl0dTGY79w#Y89ZBqTXZUZ%WF0rObmXrSL=of7pf#S-u_zqp1^HOU6zBqu%^Vpj?2GVJM5!RISu5yzEeo5uR^xX@@Vi3%cLNyOd0qFh$6fqzlo23 z|7yl37ZG}tkwhxD8KAcCs~ixes_{9x~XbZ=bEw7r8JXrG7*1>=3mQ)CA}Htkem z+>#R+QpUfZb~i_3R$3V?2M7{N8+CTG=TBfQ(;e6UgT0;8yDGM90z^5$leVr30>n0o zQay^qBWRH;aCsp7kViJ`d|;4jrh?%GYRoG0*I|LY2%o$U2CUz_o^?qVi1h7edFX@-VW~JRe?-h9je{;B^PYWh|JOErg&OMHk^kaVy zEhG08g;PtyzSw-Bz7yJ-ID4m0a_Qv#RP|ljG!$VdXZ;vcSuG{wO}F;!f~(c!6%Ft>7=NY8zec<$DB1>>PK+8pSPVmy_LGRZ1Wr42)l;Yf{^G+lzU86X( zO=T$5G{AE*rcrC6`j&)9y_T7M;PQ2(VpD2wbw<(;^adMbGk|wiK!Iv%?!Dh)(#?&r zJ;K>qCA+(BB5EZwYH1^R6UB*}1)JR)2m>G01ZsM#tgUKOK}G+=2`5=nwB||T2TzW8 z8RJv%{Y_CAw+!MEAHW-c1$Y320D-3+3-AI2pK6~|9gY(IXZ5@cH<;7H3+o{yqbRSa zpr|6JprEL%c#2Zr|1U8?PwDD#YT1H-fYV|2PXhcGZ=wI;t?a%$r0yaAU7G9rL-wf7 z7@a})`Tz3vJ^{?rz98_i?wzbMerc5@HNWtPvPl_bPN)(F%Jt*rh|`(v$@q^)!8V@j}oJ7eG|sftxS> z>CElC@^YS{$(sXj>=~7Qzt5Ke;{EzYbPadu@)9_r6pzn-rG~4K5J>1^+{m5$%5!lq zWiatR-(w9P;dgFvXlc%-NtzDpjOs75_eeF}TYGCy?Hpuqy+DYC<)aH?yNs_cRe#xN zrwAd7#QaqsseUBb_u0g;v<5BcK;}}|9qc!N{FX>;M(Z_m%Iw%}5yXz?Z9YUD(Qqj; z)@AO>bbAMAz(+)>`NfD}(VqXR`C2gJX@8WjlEFd*L@?f;SkW!Aj#RhZcvUdXahxZm z)0=w;OY?U}%(E71AzR+(XzmTO7op^)q}YZZ%s-+oPKP zq|UR`6{G?!l=v9Us$yEj4q7u?kZkcDtGV^hNxqjpT_9C{|7`R};@H?7z5w0Y)Z@hY z`0nE6G0n_@qQyXJRCL6_HF}lfb}DT^rrCgs*VTpxX&*#a>0M}?I>Q^JJN9%VXyLo{ zd{k1FyWttGlB)7K#noRE65iPf>QaK}d4{eG{QSago6gPR3?_3?^BlYmY1J*48iW2_F=B4n=6~kv$ z*XW1c><5ZDcS`Zjv~Z2owobh|Z{eHH7O?tsd%J?3&#iWMJdlS#$R~7M0xT%Pk7UVA zUXWAZ>Uyktn{Fj)kajb;IflNm+?%q7R_RpsCC=gyLzu9y`~%X1IcVi+h2f}cEE1V= zdznSZ1kB5dJQ?Kt0;*8~m!_@QW0h!_%ZK%mEkb9NeAJbQL<0g7I>=Ey-Kh`T+@>Ug zDE7E(UzTEKMSAoGjJTEJq3+$*a6( za+*Ka^9w~|WMp%-kwKpCT7+4H_za_I99dHBL$4Alr#EYKxqKE(oDN@bGM#t0w_4i4 z>a