Merge branch 'feature/apk_expansion' of github.com:asmodehn/WkCocos i…

…nto feature/apk_expansion
asmodehn · Jan 8, 2015 · 3b87311 · 3b87311
2 parents 8ac62ff + 345b7cd
commit 3b87311
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Android/app/src/main/java/com/gameparkstudio/wkcocos/testapp/DLInfo.java b/Android/app/src/main/java/com/gameparkstudio/wkcocos/testapp/DLInfo.java
@@ -10,8 +10,8 @@ public XAPKFile getMainXAPK() {
                 40074, // the version of the APK that the file was uploaded against
                 // it should be the version code added to the obb filename
                 // so it s possible that it doesn't match current BuildConfig.VERSION_CODE
-                151642L, // the length of the file in bytes
-                false //TMP : ignoring verification
+                151536L, // the length of the file in bytes
+                true
         );
 
     }

diff --git a/Android/lib/src/main/res/values/strings.xml b/Android/lib/src/main/res/values/strings.xml
@@ -6,7 +6,7 @@
     <string name="text_paused_cellular_2">If you choose not to enable downloading over cellular connections, the download will automatically resume when wi-fi is available.</string>
     <string name="text_button_resume_cellular">Resume download</string>
     <string name="text_button_wifi_settings">Wi-Fi settings</string>
-    <string name="text_verifying_download">Verifying Download</string>
+    <string name="text_verifying_download">Verifying Download and Extracting...</string>
     <string name="text_validation_complete">XAPK File Validation and Extraction Complete.  Select OK to exit.</string>
     <string name="text_validation_failed">XAPK File Validation and Extraction Failed.</string>
     <string name="text_button_pause">Pause Download</string>