Release 2.12.4

paypal · Dec 10, 2015 · cd4fd0c · cd4fd0c
1 parent 051df3f
commit cd4fd0c
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 104 deletions.
diff --git a/README.md b/README.md
@@ -21,12 +21,12 @@ The PayPal Android SDK makes it easy to add PayPal and credit card payments to m
 - [Moving to PayPal Android SDK 2.0](#moving-to-paypal-android-sdk-20)
 - [Next Steps](#next-steps)
 
-## Setup
+## Add the SDK to Your Project
 
 The PayPal Android SDK is now available at [Maven Repository](https://repo1.maven.org/maven2/com/paypal/sdk/paypal-android-sdk/). The latest version is available via `mavenCentral()`.  Just add the following dependency from `mavenCentral()`:
 
 ```
-compile 'com.paypal.sdk:paypal-android-sdk:2.12.3'
+compile 'com.paypal.sdk:paypal-android-sdk:2.12.4'
 ```
 
 
@@ -79,14 +79,6 @@ The SDK will now use the newest version of the PayPal Wallet App if present on t
 * Android 2.3.3 (API 10) or later
 * Phone or tablet
 
-
-## Add the SDK to Your Project
-
-1. Download or clone this repo. The SDK includes a .jar, static libraries, release notes, and license acknowledgements. It also includes a sample app.
-2. Copy the contents of the SDK `libs` directory into your project's `libs` directory. The path to these files is important; if it is not exactly correct, the SDK will not work.  (_NOTE:_ When using Gradle, copy SDK jar file into your project's `libs` directory, `add as library` to project, and finally copy the SDK folders containing the *.so files into `src/main/jniLibs`.)
-3. Add the open source license acknowledgments from `acknowledgments.md` to your app's acknowledgments.
-
-
 ## Credentials
 
 Your mobile integration requires different `client_id` values for each environment: Live and Test (Sandbox).
@@ -125,13 +117,71 @@ If your app initiates a transaction with a currency that turns out to be unsuppo
 
 ## Disabling card.io card scanning
 
-Future payments does not require card.io card scanning, so it is safe to remove the camera scanner libraries by removing the following folders within the `lib` directory: `arm64-v8a`, `armeabi`, `armeabi-v7a`, `mips`, `x86`, `x86_64`.
+Future payments does not require card.io card scanning. Also, for single payments, if you do not wish to include the scanning feature of Card.io, and only allow manual entry by keyboard, add packagingOptions to remove the .so libraries of card.io as shown below in build.gradle:
+```
+packagingOptions {
+        exclude 'lib/arm64-v8a/libcardioDecider.so'
+        exclude 'lib/arm64-v8a/libcardioRecognizer.so'
+        exclude 'lib/arm64-v8a/libcardioRecognizer_tegra2.so'
+        exclude 'lib/arm64-v8a/libopencv_core.so'
+        exclude 'lib/arm64-v8a/libopencv_imgproc.so'
+        exclude 'lib/armeabi/libcardioDecider.so'
+        exclude 'lib/armeabi-v7a/libcardioDecider.so'
+        exclude 'lib/armeabi-v7a/libcardioRecognizer.so'
+        exclude 'lib/armeabi-v7a/libcardioRecognizer_tegra2.so'
+        exclude 'lib/armeabi-v7a/libopencv_core.so'
+        exclude 'lib/armeabi-v7a/libopencv_imgproc.so'
+        exclude 'lib/mips/libcardioDecider.so'
+        exclude 'lib/x86/libcardioDecider.so'
+        exclude 'lib/x86/libcardioRecognizer.so'
+        exclude 'lib/x86/libcardioRecognizer_tegra2.so'
+        exclude 'lib/x86/libopencv_core.so'
+        exclude 'lib/x86/libopencv_imgproc.so'
+        exclude 'lib/x86_64/libcardioDecider.so'
+        exclude 'lib/x86_64/libcardioRecognizer.so'
+        exclude 'lib/x86_64/libcardioRecognizer_tegra2.so'
+        exclude 'lib/x86_64/libopencv_core.so'
+        exclude 'lib/x86_64/libopencv_imgproc.so'
+    }
+```
+
+## Disabling Credit Card Payments Completely
+
+If you want to disable credit card completely:
 
-Single Payments can be configured to accept credit cards through manual entry, but without card scanning.  To do so, remove the same libs above, and remove `android.permission.CAMERA` and `android.permission.VIBRATE` permissions from `AndroidManifest.xml`.  If you wish to disable credit card support altogether, follow the above steps to reduce the permissions and sdk footprint, and add the following to the `PayPalConfiguration` initialization:
+1. Remove camera scanner libraries by adding the following to your `android` build.gradle object:
+```
+packagingOptions {
+        exclude 'lib/arm64-v8a/libcardioDecider.so'
+        exclude 'lib/arm64-v8a/libcardioRecognizer.so'
+        exclude 'lib/arm64-v8a/libcardioRecognizer_tegra2.so'
+        exclude 'lib/arm64-v8a/libopencv_core.so'
+        exclude 'lib/arm64-v8a/libopencv_imgproc.so'
+        exclude 'lib/armeabi/libcardioDecider.so'
+        exclude 'lib/armeabi-v7a/libcardioDecider.so'
+        exclude 'lib/armeabi-v7a/libcardioRecognizer.so'
+        exclude 'lib/armeabi-v7a/libcardioRecognizer_tegra2.so'
+        exclude 'lib/armeabi-v7a/libopencv_core.so'
+        exclude 'lib/armeabi-v7a/libopencv_imgproc.so'
+        exclude 'lib/mips/libcardioDecider.so'
+        exclude 'lib/x86/libcardioDecider.so'
+        exclude 'lib/x86/libcardioRecognizer.so'
+        exclude 'lib/x86/libcardioRecognizer_tegra2.so'
+        exclude 'lib/x86/libopencv_core.so'
+        exclude 'lib/x86/libopencv_imgproc.so'
+        exclude 'lib/x86_64/libcardioDecider.so'
+        exclude 'lib/x86_64/libcardioRecognizer.so'
+        exclude 'lib/x86_64/libcardioRecognizer_tegra2.so'
+        exclude 'lib/x86_64/libopencv_core.so'
+        exclude 'lib/x86_64/libopencv_imgproc.so'
+    }
+```
+1. Add the following to the `PayPalConfiguration` initialization:
 ```
 config.acceptCreditCards(false);
 ```
 
+
 ## Testing
 
 During development, use `environment()` in the `PayPalConfiguration` object to change the environment.  Set it to either `ENVIRONMENT_NO_NETWORK` or `ENVIRONMENT_SANDBOX` to avoid moving real money.

diff --git a/SampleApp/build.gradle b/SampleApp/build.gradle
@@ -54,5 +54,5 @@ android {
 }
 
 dependencies {
-    compile('com.paypal.sdk:paypal-android-sdk:2.12.3')
+    compile('com.paypal.sdk:paypal-android-sdk:2.12.4')
 }
diff --git a/SampleApp/src/main/AndroidManifest.xml b/SampleApp/src/main/AndroidManifest.xml
@@ -2,19 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.paypal.example.paypalandroidsdkexample">
 
-    <!-- for card.io card scanning -->
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
-
-    <!-- for most things, including card.io & paypal -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-
     <application
-        android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
         <activity
@@ -26,25 +14,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <service android:name="com.paypal.android.sdk.payments.PayPalService"
-            android:exported="false" />
-
-        <activity android:name="com.paypal.android.sdk.payments.PaymentActivity" />
-        <activity android:name="com.paypal.android.sdk.payments.LoginActivity" />
-        <activity android:name="com.paypal.android.sdk.payments.PaymentMethodActivity" />
-        <activity android:name="com.paypal.android.sdk.payments.PaymentConfirmActivity" />
-        <activity android:name="com.paypal.android.sdk.payments.PayPalFuturePaymentActivity" />
-        <activity android:name="com.paypal.android.sdk.payments.FuturePaymentConsentActivity" />
-        <activity android:name="com.paypal.android.sdk.payments.FuturePaymentInfoActivity" />
-        <activity android:name="com.paypal.android.sdk.payments.PayPalProfileSharingActivity" />
-        <activity android:name="com.paypal.android.sdk.payments.ProfileSharingConsentActivity" />
 
-        <activity
-            android:name="io.card.payment.CardIOActivity"
-            android:configChanges="keyboardHidden|orientation" />
-        <activity android:name="io.card.payment.DataEntryActivity" />
-
     </application>
 
 </manifest>
diff --git a/aars/PayPalAndroidSDK-2.12.3.aar b/aars/PayPalAndroidSDK-2.12.3.aar
diff --git a/aars/PayPalAndroidSDK-2.12.4.aar b/aars/PayPalAndroidSDK-2.12.4.aar
diff --git a/docs/future_payments_mobile.md b/docs/future_payments_mobile.md
@@ -36,23 +36,7 @@ Obtain Customer Consent
 
 The sample app provides a more complete example. However, at minimum, you must:
 
-1. Add permissions to your `AndroidManifest.xml` file:
-    ```xml   
-    <!-- for most things, including card.io & paypal -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    ```
-
-1. Declare SDK service and activities in your `AndroidManifest.xml` file within the `<application>` tag:
-    ```xml
-    <service android:name="com.paypal.android.sdk.payments.PayPalService"
-            android:exported="false" />
-
-    <activity android:name="com.paypal.android.sdk.payments.LoginActivity" />
-    <activity android:name="com.paypal.android.sdk.payments.PayPalFuturePaymentActivity" />
-    <activity android:name="com.paypal.android.sdk.payments.FuturePaymentConsentActivity" />
-    <activity android:name="com.paypal.android.sdk.payments.FuturePaymentInfoActivity" />
-    ```
+1. Add PayPal Android SDK dependency to your `build.gradle` file as shown in README.md
 
 1. Create a `PayPalConfiguration` object.  This object allows you to configure various aspects of the SDK.
 

diff --git a/docs/profile_sharing_mobile.md b/docs/profile_sharing_mobile.md
@@ -43,23 +43,7 @@ Obtain Customer Consent
 
 The sample app provides a more complete example. However, at minimum, you must:
 
-1. Add permissions to your `AndroidManifest.xml` file:
-    ```xml   
-    <!-- for most things, including card.io & paypal -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    ```
-
-1. Declare SDK service and activities in your `AndroidManifest.xml` file within the `<application>` tag:
-    ```xml
-    <service android:name="com.paypal.android.sdk.payments.PayPalService"
-            android:exported="false" />
-
-    <activity android:name="com.paypal.android.sdk.payments.FuturePaymentInfoActivity" />
-    <activity android:name="com.paypal.android.sdk.payments.LoginActivity" />
-    <activity android:name="com.paypal.android.sdk.payments.PayPalProfileSharingActivity" />
-    <activity android:name="com.paypal.android.sdk.payments.ProfileSharingConsentActivity" />
-    ```
+1. Add PayPal Android SDK dependency to your `build.gradle` file as shown in README.md
 
 1. Create a `PayPalConfiguration` object.  This object allows you to configure various aspects of the SDK.
 

diff --git a/docs/single_payment.md b/docs/single_payment.md
@@ -33,33 +33,7 @@ Sample Code
 
 The sample app provides a more complete example. However, at minimum, you must:
 
-1. Add permissions to your `AndroidManifest.xml` file:
-    ```xml
-    <!-- for card.io card scanning -->
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
-
-    <!-- for most things, including card.io & paypal -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    ```
-
-1. Declare SDK service and activities in your `AndroidManifest.xml` file within the `<application>` tag:
-    ```xml
-    <service android:name="com.paypal.android.sdk.payments.PayPalService"
-            android:exported="false" />
-
-    <activity android:name="com.paypal.android.sdk.payments.PaymentActivity" />
-    <activity android:name="com.paypal.android.sdk.payments.LoginActivity" />
-    <activity android:name="com.paypal.android.sdk.payments.PaymentMethodActivity" />
-    <activity android:name="com.paypal.android.sdk.payments.PaymentConfirmActivity" />
-    <activity android:name="io.card.payment.CardIOActivity"
-              android:configChanges="keyboardHidden|orientation" />
-    <activity android:name="io.card.payment.DataEntryActivity" />
-    ```
+1. Add PayPal Android SDK dependency to your `build.gradle` file as shown in README.md
 
 1. Create a `PayPalConfiguration` object
     ```java

diff --git a/release_notes.md b/release_notes.md
@@ -1,6 +1,10 @@
 PayPal Android SDK release notes
 ================================
 
+2.12.4
+----
+* Documentation Updates for Maven based integrations
+
 2.12.3
 -----
 * SDK is now available at Maven Central