diff --git a/nypl-drm-checkstyle/pom.xml b/nypl-drm-checkstyle/pom.xml index 2a586ff..77a6839 100644 --- a/nypl-drm-checkstyle/pom.xml +++ b/nypl-drm-checkstyle/pom.xml @@ -8,7 +8,7 @@ org.nypl.drm nypl-drm - 0.9.0 + 1.0.0 nypl-drm-checkstyle diff --git a/nypl-drm-core-tests/nypl-drm-core-tests.iml b/nypl-drm-core-tests/nypl-drm-core-tests.iml index 8f1c1f7..95cbada 100644 --- a/nypl-drm-core-tests/nypl-drm-core-tests.iml +++ b/nypl-drm-core-tests/nypl-drm-core-tests.iml @@ -37,8 +37,8 @@ - - + + diff --git a/nypl-drm-core-tests/pom.xml b/nypl-drm-core-tests/pom.xml index 319ba65..210e931 100644 --- a/nypl-drm-core-tests/pom.xml +++ b/nypl-drm-core-tests/pom.xml @@ -8,7 +8,7 @@ org.nypl.drm nypl-drm - 0.9.0 + 1.0.0 nypl-drm-core-tests diff --git a/nypl-drm-core-tests/src/main/AndroidManifest.xml b/nypl-drm-core-tests/src/main/AndroidManifest.xml index 3f69524..d75358e 100644 --- a/nypl-drm-core-tests/src/main/AndroidManifest.xml +++ b/nypl-drm-core-tests/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" package="org.nypl.drm.tests.core" android:versionCode="9" - android:versionName="0.9.0"> + android:versionName="1.0.0"> - - + + diff --git a/nypl-drm-core/pom.xml b/nypl-drm-core/pom.xml index 77b383a..9394e2c 100644 --- a/nypl-drm-core/pom.xml +++ b/nypl-drm-core/pom.xml @@ -8,7 +8,7 @@ org.nypl.drm nypl-drm - 0.9.0 + 1.0.0 nypl-drm-core diff --git a/nypl-drm-core/src/main/java/org/nypl/drm/core/AdobeAdeptConnectorType.java b/nypl-drm-core/src/main/java/org/nypl/drm/core/AdobeAdeptConnectorType.java index b45eaea..3c5370d 100644 --- a/nypl-drm-core/src/main/java/org/nypl/drm/core/AdobeAdeptConnectorType.java +++ b/nypl-drm-core/src/main/java/org/nypl/drm/core/AdobeAdeptConnectorType.java @@ -91,11 +91,13 @@ void deactivateDevice( * * @param listener The result listener * @param acsm The ACSM data + * @param user The Adobe User ID */ void fulfillACSM( AdobeAdeptFulfillmentListenerType listener, - byte[] acsm); + byte[] acsm, + AdobeUserID user); /** * Attempt to join the account {@code user} with the currently activated @@ -114,9 +116,11 @@ void joinAccount( * * @param listener The result listener * @param loan_id The loan ID + * @param user The Adobe User ID */ void loanReturn( AdobeAdeptLoanReturnListenerType listener, - AdobeLoanID loan_id); + AdobeLoanID loan_id, + AdobeUserID user); } diff --git a/nypl-drm-core/src/main/java/org/nypl/drm/core/AdobeAdeptFulfillmentListenerType.java b/nypl-drm-core/src/main/java/org/nypl/drm/core/AdobeAdeptFulfillmentListenerType.java index bef9471..209fd6d 100644 --- a/nypl-drm-core/src/main/java/org/nypl/drm/core/AdobeAdeptFulfillmentListenerType.java +++ b/nypl-drm-core/src/main/java/org/nypl/drm/core/AdobeAdeptFulfillmentListenerType.java @@ -5,8 +5,7 @@ /** * The type of listeners that receive the results of fulfillment operations. * - * @see AdobeAdeptConnectorType#fulfillACSM(AdobeAdeptFulfillmentListenerType, - * byte[]) + * @see AdobeAdeptConnectorType#fulfillACSM(AdobeAdeptFulfillmentListenerType, byte[], AdobeUserID) */ public interface AdobeAdeptFulfillmentListenerType diff --git a/pom.xml b/pom.xml index 394c58a..d881611 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 4.0.0 org.nypl.drm nypl-drm - 0.9.0 + 1.0.0 pom NYPL DRM