IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

add new config settings and fix few package issues

new_design
Mukesh Dhungana 3 years ago
parent
244170b5af
commit
6ed9e48388
7 changed files with 48 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      app/build.gradle
  2. 9
      app/proguard-rules.pro
  3. 2
      app/src/main/AndroidManifest.xml
  4. 4
      app/src/main/java/com/remit/jmecustomer/base/PrivilegedGateway.java
  5. 3
      app/src/main/java/com/remit/jmecustomer/utils/https/HttpClientV2.java
  6. 43
      app/src/main/res/layout/activity_settings.xml
  7. BIN
      keystores/JmeKeyStores/upload-keystore.jks

24
app/build.gradle
View File

@ -33,11 +33,11 @@ android {
signingConfigs { signingConfigs {
release { 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 { stag {
keyAlias 'JPT' keyAlias 'JPT'
@ -48,13 +48,18 @@ android {
} }
buildTypes { buildTypes {
release { 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', 'API_VERSION', '"v1"'
buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/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 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.txt'), 'proguard-rules.pro'
//proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
livedebug { livedebug {
@ -99,6 +104,9 @@ android {
buildConfigField 'String', 'BASE_URL', '"http://202.166.220.36:8083/api/"' buildConfigField 'String', 'BASE_URL', '"http://202.166.220.36:8083/api/"'
buildConfigField 'String', 'API_VERSION', '"v1"' buildConfigField 'String', 'API_VERSION', '"v1"'
buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/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 debuggable true
minifyEnabled false minifyEnabled false
shrinkResources false shrinkResources false

9
app/proguard-rules.pro
View File

@ -61,7 +61,7 @@
-keep class org.apache.xml.security.utils.** { *; } -keep class org.apache.xml.security.utils.** { *; }
-dontwarn 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 -dontwarn javax.xml.crypto.XMLStructure
#joda time #joda time
@ -78,18 +78,19 @@
-dontnote okhttp3.** -dontnote okhttp3.**
# Okio # Okio
-keep class sun.misc.Unsafe { *; }
-keep class sun.misc.Unsafe.** { *; }
-dontwarn java.nio.file.* -dontwarn java.nio.file.*
-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
-keepattributes *Annotation* -keepattributes *Annotation*
-keepclassmembers class ** { -keepclassmembers class ** {
@org.greenrobot.eventbus.Subscribe <methods>;
*;
} }
-keep enum org.greenrobot.eventbus.ThreadMode { *; }
-keep enum org.greenrobot.eventbus.ThreadMode.** { *; }
# Only required if you use AsyncExecutor # Only required if you use AsyncExecutor
#noinspection ShrinkerUnresolvedReference
-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent { -keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
<init>(java.lang.Throwable); <init>(java.lang.Throwable);
} }

2
app/src/main/AndroidManifest.xml
View File

@ -18,7 +18,7 @@
<application <application
android:name="com.remit.jmecustomer.RemitApplication" android:name="com.remit.jmecustomer.RemitApplication"
android:allowBackup="false" android:allowBackup="false"
android:debuggable="true"
android:debuggable="false"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:largeHeap="true" android:largeHeap="true"

4
app/src/main/java/com/remit/jmecustomer/base/PrivilegedGateway.java
View File

@ -5,6 +5,7 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.util.Log; import android.util.Log;
import com.remit.jmecustomer.BuildConfig;
import com.remit.jmecustomer.features.home.model.UserInfoModelV2; import com.remit.jmecustomer.features.home.model.UserInfoModelV2;
import com.remit.jmecustomer.utils.Utils; import com.remit.jmecustomer.utils.Utils;
import com.remit.jmecustomer.RemitApplication; import com.remit.jmecustomer.RemitApplication;
@ -57,7 +58,8 @@ public abstract class PrivilegedGateway extends BaseGateway implements Privilege
@Override @Override
public String getBasicAuth(Context context) { public String getBasicAuth(Context context) {
return "Basic " + Utils.toBase64("172017F9EC11222E8107142733:QRK2UM0Q:" + RemitApplication.getAppRelatedMetaData(context).getDeviceId());
//return "Basic " + Utils.toBase64("172017F9EC11222E8107142733:QRK2UM0Q:" + RemitApplication.getAppRelatedMetaData(context).getDeviceId());
return "Basic " + Utils.toBase64(BuildConfig.ClientId+":"+BuildConfig.SecretKey+":" + RemitApplication.getAppRelatedMetaData(context).getDeviceId());
} }
@Override @Override

3
app/src/main/java/com/remit/jmecustomer/utils/https/HttpClientV2.java
View File

@ -39,7 +39,8 @@ public class HttpClientV2 {
httpClient.writeTimeout(150, TimeUnit.SECONDS); httpClient.writeTimeout(150, TimeUnit.SECONDS);
Interceptor authInterceptor = chain -> { Interceptor authInterceptor = chain -> {
Request newRequest = chain.request().newBuilder() 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()) .addHeader("lang", RemitApplication.getPreferredCountryCode().toLowerCase())
.build(); .build();
return chain.proceed(newRequest); return chain.proceed(newRequest);

43
app/src/main/res/layout/activity_settings.xml
View File

@ -54,23 +54,23 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="52dp"
android:paddingStart="52dp" android:paddingStart="52dp"
android:paddingLeft="52dp"
android:paddingTop="14dp"> android:paddingTop="14dp">
<com.remit.jmecustomer.common.customwidgets.JmeTextView <com.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/view_change_password" android:id="@+id/view_change_password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:paddingLeft="21dp"
android:paddingStart="21dp" android:paddingStart="21dp"
android:paddingLeft="21dp"
android:paddingTop="16dp" android:paddingTop="16dp"
android:paddingBottom="15dp"
android:text="@string/change_password_text" android:text="@string/change_password_text"
android:textColor="@color/darkgray" android:textColor="@color/darkgray"
android:textSize="14sp" /> android:textSize="14sp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
@ -81,11 +81,11 @@
android:id="@+id/view_change_pin" android:id="@+id/view_change_pin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:paddingLeft="21dp"
android:layout_marginTop="14dp"
android:paddingStart="21dp" android:paddingStart="21dp"
android:paddingLeft="21dp"
android:paddingTop="16dp" android:paddingTop="16dp"
android:layout_marginTop="14dp"
android:paddingBottom="15dp"
android:text="@string/changepin_text" android:text="@string/changepin_text"
android:textColor="@color/darkgray" android:textColor="@color/darkgray"
android:textSize="14sp" /> android:textSize="14sp" />
@ -95,41 +95,40 @@
android:layout_height="1dp" android:layout_height="1dp"
android:background="@color/divider_dark" /> android:background="@color/divider_dark" />
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:layout_marginTop="14dp"
android:id="@+id/view_language"
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/view_fingerprint"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:paddingLeft="21dp"
android:layout_marginTop="14dp"
android:paddingStart="21dp" android:paddingStart="21dp"
android:paddingLeft="21dp"
android:paddingTop="16dp" android:paddingTop="16dp"
android:text="@string/language_text"
android:paddingEnd="21dp"
android:paddingBottom="15dp"
android:text="@string/login_biometric_setup_text"
android:textColor="@color/darkgray" android:textColor="@color/darkgray"
android:textSize="14sp" /> android:textSize="14sp" />
<View <View
android:id="@+id/view_fingerprint_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@color/divider_dark" /> android:background="@color/divider_dark" />
<androidx.appcompat.widget.SwitchCompat
android:layout_marginTop="14dp"
android:id="@+id/view_fingerprint"
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/view_language"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:paddingLeft="21dp"
android:layout_marginTop="14dp"
android:paddingStart="21dp" android:paddingStart="21dp"
android:paddingEnd="21dp"
android:paddingLeft="21dp"
android:paddingTop="16dp" android:paddingTop="16dp"
android:text="@string/login_biometric_setup_text"
android:paddingBottom="15dp"
android:text="@string/language_text"
android:textColor="@color/darkgray" android:textColor="@color/darkgray"
android:textSize="14sp" /> android:textSize="14sp" />
<View <View
android:id="@+id/view_fingerprint_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@color/divider_dark" /> android:background="@color/divider_dark" />

BIN
keystores/JmeKeyStores/upload-keystore.jks
View File

Write Preview
Loading…
Cancel
Save