diff --git a/.DS_Store b/.DS_Store index 0c83a90..06a8d64 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/IntegrationSampleApp-PayumoneyPnP.iml b/IntegrationSampleApp-PayumoneyPnP.iml old mode 100644 new mode 100755 diff --git a/app/.DS_Store b/app/.DS_Store old mode 100644 new mode 100755 index e253479..fe32a94 Binary files a/app/.DS_Store and b/app/.DS_Store differ diff --git a/app/.gitignore b/app/.gitignore old mode 100644 new mode 100755 diff --git a/app/app.iml b/app/app.iml old mode 100644 new mode 100755 index 39f53c3..6c647b2 --- a/app/app.iml +++ b/app/app.iml @@ -22,7 +22,7 @@ - + @@ -95,15 +95,16 @@ - - - + + + + @@ -114,27 +115,27 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle old mode 100644 new mode 100755 index c6795c6..bbc2639 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,8 +27,12 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { + debug { + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -43,10 +47,6 @@ dependencies { compile 'com.android.support:cardview-v7:23.2.1' compile 'com.android.support:appcompat-v7:23.2.1' - compile('com.payumoney.sdkui:plug-n-play:1.0.0'){ - transitive = true; - exclude module: 'payumoney-sdk' - } + compile('com.payumoney.sdkui:plug-n-play:1.1.0') - compile 'com.payumoney.core:payumoney-sdk:7.0.1' } \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro old mode 100644 new mode 100755 diff --git a/app/src/.DS_Store b/app/src/.DS_Store old mode 100644 new mode 100755 diff --git a/app/src/androidTest/java/com/rahulhooda/integrationsampleapp_payumoneypnp/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/rahulhooda/integrationsampleapp_payumoneypnp/ExampleInstrumentedTest.java old mode 100644 new mode 100755 diff --git a/app/src/main/.DS_Store b/app/src/main/.DS_Store old mode 100644 new mode 100755 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml old mode 100644 new mode 100755 diff --git a/app/src/main/java/.DS_Store b/app/src/main/java/.DS_Store old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/.DS_Store b/app/src/main/java/com/.DS_Store old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rahulhooda/.DS_Store b/app/src/main/java/com/rahulhooda/.DS_Store old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/.DS_Store b/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/.DS_Store old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/AppEnvironment.java b/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/AppEnvironment.java old mode 100644 new mode 100755 index 8d54388..0ca5647 --- a/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/AppEnvironment.java +++ b/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/AppEnvironment.java @@ -40,13 +40,13 @@ public boolean debug() { PRODUCTION { @Override public String merchant_Key() { - return "O15vkB"; - } + return "dcwQGU"; + } //O15vkB @Override public String merchant_ID() { - return "4819816"; - } + return "4931752"; + } //4819816 @Override public String furl() { @@ -60,8 +60,8 @@ public String surl() { @Override public String salt() { - return "LU1EhObh"; - } + return "dzC2i5pp"; + } //LU1EhObh @Override public boolean debug() { diff --git a/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/AppPreference.java b/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/AppPreference.java old mode 100644 new mode 100755 index 334f905..3f83251 --- a/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/AppPreference.java +++ b/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/AppPreference.java @@ -14,7 +14,7 @@ public class AppPreference { private String dummyEmail = "xyz@gmail.com"; private String productInfo = "product_info"; private String firstName = "firstname"; - private boolean isOverrideResultScreen = false; + private boolean isOverrideResultScreen = true; public static final String USER_EMAIL = "user_email"; public static final String USER_MOBILE = "user_mobile"; diff --git a/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/BaseActivity.java b/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/BaseActivity.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/BaseApplication.java b/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/BaseApplication.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/MainActivity.java b/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/MainActivity.java old mode 100644 new mode 100755 index f7ea1d5..945925f --- a/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/MainActivity.java +++ b/app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/MainActivity.java @@ -304,7 +304,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { // Response from SURl and FURL String merchantResponse = transactionResponse.getTransactionDetails(); - new AlertDialog.Builder(this) + new AlertDialog.Builder(this) .setCancelable(false) .setMessage("Payu's Data : " + payuResponse + "\n\n\n Merchant's Data: " + merchantResponse) .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @@ -347,7 +347,7 @@ private void initListeners() { radioGroup_color_theme.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { @Override public void onCheckedChanged(RadioGroup radioGroup, @IdRes int i) { - mAppPreference.setOverrideResultScreen(false); + mAppPreference.setOverrideResultScreen(true); switch (i) { case R.id.radio_btn_theme_default: @@ -513,8 +513,8 @@ private void launchPayUMoneyFlow() { * Do not use below code when going live * Below code is provided to generate hash from sdk. * It is recommended to generate hash from server side only. - * *//* - mPaymentParams = calculateServerSideHashAndInitiatePayment1(mPaymentParams); + * */ + /* mPaymentParams = calculateServerSideHashAndInitiatePayment1(mPaymentParams); if (AppPreference.selectedTheme != -1) { PayUmoneyFlowManager.startPayUMoneyFlow(mPaymentParams,MainActivity.this, AppPreference.selectedTheme,mAppPreference.isOverrideResultScreen()); diff --git a/app/src/main/res/drawable/app_logo.xml b/app/src/main/res/drawable/app_logo.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/bg_rounded_button.xml b/app/src/main/res/drawable/bg_rounded_button.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/.DS_Store b/app/src/main/res/layout/.DS_Store old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml old mode 100644 new mode 100755 diff --git a/app/src/test/java/com/rahulhooda/integrationsampleapp_payumoneypnp/ExampleUnitTest.java b/app/src/test/java/com/rahulhooda/integrationsampleapp_payumoneypnp/ExampleUnitTest.java old mode 100644 new mode 100755 diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 diff --git a/build/generated/mockable-android-23.jar b/build/generated/mockable-android-23.jar old mode 100644 new mode 100755 diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml old mode 100644 new mode 100755 index 5805f68..f356246 --- a/build/intermediates/dex-cache/cache.xml +++ b/build/intermediates/dex-cache/cache.xml @@ -3,210 +3,210 @@ - + sha1="c93ec2c2bacd3fc6a24530d6c0be4afdbde0ba3d"> + - + sha1="f1bc476cc167b18e66c297df599b2377131a8947"> + - + sha1="b42cf2134829f715edfa2adaf0ee246631322dba"> + - + sha1="e4d0cbb0b999604b349062f0214a0a228a7fd151"> + - + sha1="591e7c1eb05bda2bcee22d151402fd8d61ffeca9"> + - + sha1="ed6b455e3dd7bbf1ff31f8df0b41e2f0d87f3ace"> + - + sha1="673d77a5bbddd766037f088e775df525c46407f0"> + - + sha1="93b399470e72c0bc8cb52379943b63c9aa586cd8"> + - + sha1="3469cb457f10f74c28cbc05f069b6c894f6cbdd0"> + - + sha1="72961d8b453b46e277702f18de9d210bc019e36e"> + - + sha1="179b5ab02f5f249358175c7c62a1a3e4a4dff591"> + - + sha1="ccb693bc0774fcb637246f7360de25b4af7df318"> + - + sha1="e3885783ff8926ed9e2fdcd16816c2e1e73e7aee"> + - + sha1="a319fd4d548ba4cc9511561d37109ba922bfbf6a"> + - + sha1="7ff77725723167163d69439e3fd077bd0899babf"> + - + sha1="2cd4b982617e544728de0782d718a58ce1b06e3f"> + - + sha1="3cef25b344d6893e5e2d9b1ae38d180955e9d3ef"> + - + sha1="607a3d0b8013b4ccbfeb0b7cb293351994e021fb"> + - + sha1="feb035e98d4fef27ff2a6f45bbaac40c07a6596a"> + - + sha1="cb86970df0f0f25f766d320b279c7858c1ca0003"> + - + - + sha1="3be474b1b21b31cf2fa93fe6bd641ae108d96452"> + - + sha1="97e8b48d7874dad1ded66324f8a879c1c3b17172"> + diff --git a/build/intermediates/proguard-files/proguard-android-optimize.txt-2.2.3 b/build/intermediates/proguard-files/proguard-android-optimize.txt-2.2.3 new file mode 100644 index 0000000..f642ff3 --- /dev/null +++ b/build/intermediates/proguard-files/proguard-android-optimize.txt-2.2.3 @@ -0,0 +1,96 @@ +# This is a configuration file for ProGuard. +# http://proguard.sourceforge.net/index.html#manual/usage.html +# +# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with +# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and +# will be ignored by new version of the Android plugin for Gradle. +# +# Optimizations: If you don't want to optimize, use the +# proguard-android.txt configuration file instead of this one, which +# turns off the optimization flags. Adding optimization introduces +# certain risks, since for example not all optimizations performed by +# ProGuard works on all versions of Dalvik. The following flags turn +# off various optimizations known to have issues, but the list may not +# be complete or up to date. (The "arithmetic" optimization can be +# used if you are only targeting Android 2.0 or later.) Make sure you +# test thoroughly if you go this route. +-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/* +-optimizationpasses 5 +-allowaccessmodification +-dontpreverify + +# The remainder of this file is identical to the non-optimized version +# of the Proguard configuration file (except that the other file has +# flags to turn off optimization). + +-dontusemixedcaseclassnames +-dontskipnonpubliclibraryclasses +-verbose + +# Preserve some attributes that may be required for reflection. +-keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod + +-keep public class com.google.vending.licensing.ILicensingService +-keep public class com.android.vending.licensing.ILicensingService +-keep public class com.google.android.vending.licensing.ILicensingService +-dontnote com.android.vending.licensing.ILicensingService +-dontnote com.google.vending.licensing.ILicensingService +-dontnote com.google.android.vending.licensing.ILicensingService + +# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native +-keepclasseswithmembernames class * { + native ; +} + +# Keep setters in Views so that animations can still work. +-keepclassmembers public class * extends android.view.View { + void set*(***); + *** get*(); +} + +# We want to keep methods in Activity that could be used in the XML attribute onClick. +-keepclassmembers class * extends android.app.Activity { + public void *(android.view.View); +} + +# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + +-keepclassmembers class * implements android.os.Parcelable { + public static final ** CREATOR; +} + +-keepclassmembers class **.R$* { + public static ; +} + +# Preserve annotated Javascript interface methods. +-keepclassmembers class * { + @android.webkit.JavascriptInterface ; +} + +# The support libraries contains references to newer platform versions. +# Don't warn about those in case this app is linking against an older +# platform version. We know about them, and they are safe. +-dontnote android.support.** +-dontwarn android.support.** + +# Understand the @Keep support annotation. +-keep class android.support.annotation.Keep + +-keep @android.support.annotation.Keep class * {*;} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep (...); +} diff --git a/build/intermediates/proguard-files/proguard-android.txt-2.2.3 b/build/intermediates/proguard-files/proguard-android.txt-2.2.3 new file mode 100644 index 0000000..ae8f935 --- /dev/null +++ b/build/intermediates/proguard-files/proguard-android.txt-2.2.3 @@ -0,0 +1,89 @@ +# This is a configuration file for ProGuard. +# http://proguard.sourceforge.net/index.html#manual/usage.html +# +# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with +# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and +# will be ignored by new version of the Android plugin for Gradle. + +-dontusemixedcaseclassnames +-dontskipnonpubliclibraryclasses +-verbose + +# Optimization is turned off by default. Dex does not like code run +# through the ProGuard optimize and preverify steps (and performs some +# of these optimizations on its own). +-dontoptimize +-dontpreverify +# Note that if you want to enable optimization, you cannot just +# include optimization flags in your own project configuration file; +# instead you will need to point to the +# "proguard-android-optimize.txt" file instead of this one from your +# project.properties file. + +# Preserve some attributes that may be required for reflection. +-keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod + +-keep public class com.google.vending.licensing.ILicensingService +-keep public class com.android.vending.licensing.ILicensingService +-keep public class com.google.android.vending.licensing.ILicensingService +-dontnote com.android.vending.licensing.ILicensingService +-dontnote com.google.vending.licensing.ILicensingService +-dontnote com.google.android.vending.licensing.ILicensingService + +# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native +-keepclasseswithmembernames class * { + native ; +} + +# Keep setters in Views so that animations can still work. +-keepclassmembers public class * extends android.view.View { + void set*(***); + *** get*(); +} + +# We want to keep methods in Activity that could be used in the XML attribute onClick. +-keepclassmembers class * extends android.app.Activity { + public void *(android.view.View); +} + +# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + +-keepclassmembers class * implements android.os.Parcelable { + public static final ** CREATOR; +} + +-keepclassmembers class **.R$* { + public static ; +} + +# Preserve annotated Javascript interface methods. +-keepclassmembers class * { + @android.webkit.JavascriptInterface ; +} + +# The support libraries contains references to newer platform versions. +# Don't warn about those in case this app is linking against an older +# platform version. We know about them, and they are safe. +-dontnote android.support.** +-dontwarn android.support.** + +# Understand the @Keep support annotation. +-keep class android.support.annotation.Keep + +-keep @android.support.annotation.Keep class * {*;} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep (...); +} diff --git a/gradle.properties b/gradle.properties old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100644 new mode 100755 diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 diff --git a/local.properties b/local.properties old mode 100644 new mode 100755 index 8d740a0..0852c90 --- a/local.properties +++ b/local.properties @@ -7,5 +7,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Fri Oct 06 11:02:41 IST 2017 -sdk.dir=/Users/disha.mukherjee/Library/Android/sdk +#Thu Dec 07 12:38:47 IST 2017 +sdk.dir=/Users/dolly.mittal/Library/Android/sdk diff --git a/payumoney-new-sample-app.iml b/payumoney-new-sample-app-master.iml similarity index 75% rename from payumoney-new-sample-app.iml rename to payumoney-new-sample-app-master.iml index ea90c84..cd7b7c8 100644 --- a/payumoney-new-sample-app.iml +++ b/payumoney-new-sample-app-master.iml @@ -1,5 +1,5 @@ - + diff --git a/settings.gradle b/settings.gradle old mode 100644 new mode 100755