Merge pull request #54 from clover/r191.6

Release 191.6
clover · May 24, 2018 · e9fb3b7 · e9fb3b7
2 parents 45da164 + 877042f
commit e9fb3b7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/clover-android-connector-sdk/build.gradle b/clover-android-connector-sdk/build.gradle
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 group = 'com.clover.sdk'
-version = '191.4'
+version = '191.6'
 
 
 apply from: file("${project.rootDir}/lib.gradle")

diff --git a/clover-android-sdk-examples/build.gradle b/clover-android-sdk-examples/build.gradle
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 group = 'com.clover.sdk'
-version = '191.4'
+version = '191.6'
 
 apply from: file("${project.rootDir}/versions.gradle")
 

diff --git a/clover-android-sdk/build.gradle b/clover-android-sdk/build.gradle
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 group = 'com.clover.sdk'
-version = '191.4'
+version = '191.6'
 
 apply from: file("${project.rootDir}/lib.gradle")
 

diff --git a/clover-android-sdk/src/main/java/com/clover/sdk/cashdrawer/CashDrawers.java b/clover-android-sdk/src/main/java/com/clover/sdk/cashdrawer/CashDrawers.java
@@ -37,9 +37,12 @@ public CashDrawers(Context context) {
   }
 
   private void checkPermission() throws SecurityException {
-    String p = context.getString(R.string.permission_pop_cash_drawer);
-    if (context.checkCallingOrSelfPermission(p) != PackageManager.PERMISSION_GRANTED) {
-      throw new SecurityException("Application is not granted permission: " + p);
+    String oldPermission = context.getString(R.string.permission_pop_cash_drawer);
+    String newPermission = context.getString(R.string.permission_pop_cash_drawer_new);
+    boolean gotOldPermission = (context.checkCallingOrSelfPermission(oldPermission) == PackageManager.PERMISSION_GRANTED);
+    boolean gotNewPermission = (context.checkCallingOrSelfPermission(newPermission) == PackageManager.PERMISSION_GRANTED);
+    if (!(gotNewPermission || gotOldPermission)) {
+      throw new SecurityException("Application is not granted permission: " + newPermission);
     }
   }
 

diff --git a/clover-android-sdk/src/main/java/com/clover/sdk/cashdrawer/package-info.java b/clover-android-sdk/src/main/java/com/clover/sdk/cashdrawer/package-info.java
@@ -24,7 +24,7 @@
  * </code>
  * </pre>
  *
- * Your application must be granted the permission <code>clover.permission.POP_CASH_DRAWER</code> in order to use
+ * Your application must be granted the permission <code>clover.permission.POP_CASH_DRAWER_NEW</code> in order to use
  * the classes in this package.
  */
 package com.clover.sdk.cashdrawer;
diff --git a/clover-android-sdk/src/main/res/values/perms.xml b/clover-android-sdk/src/main/res/values/perms.xml
@@ -17,4 +17,5 @@
 
 <resources>
   <string name="permission_pop_cash_drawer">clover.permission.POP_CASH_DRAWER</string>
+  <string name="permission_pop_cash_drawer_new">clover.permission.POP_CASH_DRAWER_NEW</string>
 </resources>