diff --git a/plugin.xml b/plugin.xml
index c2fb35ad..40ce10a2 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/src/android/libs/MobileSync/build.gradle b/src/android/libs/MobileSync/build.gradle
index 806fc58e..1bb817f7 100644
--- a/src/android/libs/MobileSync/build.gradle
+++ b/src/android/libs/MobileSync/build.gradle
@@ -70,8 +70,10 @@ android {
ext {
PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
- PUBLISH_VERSION = '9.1.1'
+ PUBLISH_VERSION = '9.2.0'
PUBLISH_ARTIFACT_ID = 'MobileSync'
}
-apply from: "${rootProject.projectDir}/publish/publish-module.gradle"
+if (rootProject.name == 'SalesforceMobileSDK-Android') {
+ apply from: "${rootProject.projectDir}/publish/publish-module.gradle"
+}
diff --git a/src/android/libs/SalesforceAnalytics/build.gradle b/src/android/libs/SalesforceAnalytics/build.gradle
index c672e99a..0980f4e4 100644
--- a/src/android/libs/SalesforceAnalytics/build.gradle
+++ b/src/android/libs/SalesforceAnalytics/build.gradle
@@ -65,8 +65,10 @@ android {
ext {
PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
- PUBLISH_VERSION = '9.1.1'
+ PUBLISH_VERSION = '9.2.0'
PUBLISH_ARTIFACT_ID = 'SalesforceAnalytics'
}
-apply from: "${rootProject.projectDir}/publish/publish-module.gradle"
\ No newline at end of file
+if (rootProject.name == 'SalesforceMobileSDK-Android') {
+ apply from: "${rootProject.projectDir}/publish/publish-module.gradle"
+}
\ No newline at end of file
diff --git a/src/android/libs/SalesforceHybrid/build.gradle b/src/android/libs/SalesforceHybrid/build.gradle
index eca84345..378dbfdf 100644
--- a/src/android/libs/SalesforceHybrid/build.gradle
+++ b/src/android/libs/SalesforceHybrid/build.gradle
@@ -68,8 +68,10 @@ android {
ext {
PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
- PUBLISH_VERSION = '9.1.1'
+ PUBLISH_VERSION = '9.2.0'
PUBLISH_ARTIFACT_ID = 'SalesforceHybrid'
}
-apply from: "${rootProject.projectDir}/publish/publish-module.gradle"
\ No newline at end of file
+if (rootProject.name == 'SalesforceMobileSDK-Android') {
+ apply from: "${rootProject.projectDir}/publish/publish-module.gradle"
+}
\ No newline at end of file
diff --git a/src/android/libs/SalesforceSDK/build.gradle b/src/android/libs/SalesforceSDK/build.gradle
index 135577ba..11aa9458 100644
--- a/src/android/libs/SalesforceSDK/build.gradle
+++ b/src/android/libs/SalesforceSDK/build.gradle
@@ -74,8 +74,10 @@ android {
ext {
PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
- PUBLISH_VERSION = '9.1.1'
+ PUBLISH_VERSION = '9.2.0'
PUBLISH_ARTIFACT_ID = 'SalesforceSDK'
}
-apply from: "${rootProject.projectDir}/publish/publish-module.gradle"
\ No newline at end of file
+if (rootProject.name == 'SalesforceMobileSDK-Android') {
+ apply from: "${rootProject.projectDir}/publish/publish-module.gradle"
+}
\ No newline at end of file
diff --git a/src/android/libs/SmartStore/build.gradle b/src/android/libs/SmartStore/build.gradle
index abb5f366..09437e5e 100644
--- a/src/android/libs/SmartStore/build.gradle
+++ b/src/android/libs/SmartStore/build.gradle
@@ -69,8 +69,10 @@ android {
ext {
PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
- PUBLISH_VERSION = '9.1.1'
+ PUBLISH_VERSION = '9.2.0'
PUBLISH_ARTIFACT_ID = 'SmartStore'
}
-apply from: "${rootProject.projectDir}/publish/publish-module.gradle"
\ No newline at end of file
+if (rootProject.name == 'SalesforceMobileSDK-Android') {
+ apply from: "${rootProject.projectDir}/publish/publish-module.gradle"
+}
\ No newline at end of file
diff --git a/src/android/libs/SmartStore/src/com/salesforce/androidsdk/smartstore/store/KeyValueEncryptedFileStore.java b/src/android/libs/SmartStore/src/com/salesforce/androidsdk/smartstore/store/KeyValueEncryptedFileStore.java
index 6e0ffeca..25ee3d70 100644
--- a/src/android/libs/SmartStore/src/com/salesforce/androidsdk/smartstore/store/KeyValueEncryptedFileStore.java
+++ b/src/android/libs/SmartStore/src/com/salesforce/androidsdk/smartstore/store/KeyValueEncryptedFileStore.java
@@ -43,6 +43,7 @@
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -269,9 +270,13 @@ public void deleteAll() {
file.delete();
}
} else {
- for (String key : keySet()) {
- SmartStoreLogger.i(TAG, "deleting key :" + key);
- deleteValue(key);
+ for (File file : safeListFiles(KEY_SUFFIX)) {
+ SmartStoreLogger.i(TAG, "deleting file :" + file.getName());
+ file.delete();
+ }
+ for (File file : safeListFiles(VALUE_SUFFIX)) {
+ SmartStoreLogger.i(TAG, "deleting file :" + file.getName());
+ file.delete();
}
}
}
@@ -293,7 +298,7 @@ public Set keySet() {
keys.add(key);
} catch (Exception e) {
SmartStoreLogger.e(TAG, "keySet(): Threw exception for:" + file.getName(), e);
- return null;
+ // skip the bad key but keep going
}
}
return keys;
@@ -302,7 +307,7 @@ public Set keySet() {
/** @return number of entries in the store. */
@Override
public int count() {
- return kvVersion == 1 ? safeListFiles(null /* all */).length : safeListFiles(VALUE_SUFFIX).length;
+ return kvVersion == 1 ? safeListFiles(null /* all */).length : keySet().size();
}
/** @return True if store is empty. */