Merge pull request #3 from NYPL-Simplified/multi_user_activation

added functionality to set current active user
NYPL-Simplified · Apr 18, 2017 · 0e857f3 · 0e857f3
2 parents b525ec5 + 9215e61
commit 0e857f3
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 13 deletions.
diff --git a/nypl-drm-checkstyle/pom.xml b/nypl-drm-checkstyle/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.nypl.drm</groupId>
     <artifactId>nypl-drm</artifactId>
-    <version>0.9.0</version>
+    <version>1.0.0</version>
   </parent>
   <artifactId>nypl-drm-checkstyle</artifactId>
 

diff --git a/nypl-drm-core-tests/nypl-drm-core-tests.iml b/nypl-drm-core-tests/nypl-drm-core-tests.iml
@@ -37,8 +37,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="nypl-drm-core" />
-    <orderEntry type="library" name="Maven: com.io7m.jnull:io7m-jnull-core:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.io7m.junreachable:io7m-junreachable-core:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.io7m.jnull:io7m-jnull-core:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.io7m.junreachable:io7m-junreachable-core:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: android:android:4.4.2_r4" level="project" />
     <orderEntry type="library" name="Maven: com.github.tony19:logback-android-core:1.1.1-3" level="project" />

diff --git a/nypl-drm-core-tests/pom.xml b/nypl-drm-core-tests/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.nypl.drm</groupId>
     <artifactId>nypl-drm</artifactId>
-    <version>0.9.0</version>
+    <version>1.0.0</version>
   </parent>
   <artifactId>nypl-drm-core-tests</artifactId>
 

diff --git 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">
 
   <uses-sdk
     android:minSdkVersion="19"

diff --git a/nypl-drm-core/nypl-drm-core.iml b/nypl-drm-core/nypl-drm-core.iml
@@ -10,8 +10,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.io7m.jnull:io7m-jnull-core:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.io7m.junreachable:io7m-junreachable-core:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.io7m.jnull:io7m-jnull-core:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.io7m.junreachable:io7m-junreachable-core:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: android:android:4.4.2_r4" level="project" />
   </component>

diff --git a/nypl-drm-core/pom.xml b/nypl-drm-core/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.nypl.drm</groupId>
     <artifactId>nypl-drm</artifactId>
-    <version>0.9.0</version>
+    <version>1.0.0</version>
   </parent>
   <artifactId>nypl-drm-core</artifactId>
 

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
@@ -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
@@ -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
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.nypl.drm</groupId>
   <artifactId>nypl-drm</artifactId>
-  <version>0.9.0</version>
+  <version>1.0.0</version>
 
   <packaging>pom</packaging>
   <description>NYPL DRM</description>