Merge pull request #118 from Dukobpa3/feature/ios_tune_up

Feature/ios tune up

Author: akarimova

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "sample"]
 	path = sample
-	url = https://github.com/GrimReio/OpenIAB-sample-game.git
+url=../OpenIAB-sample-game.git
 [submodule "OpenIAB"]
 	path = OpenIAB
 	url = ../OpenIAB.git

OpenIAB

@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="OpenIAB-Unity-Plugin" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>

OpenIAB-Unity-Plugin.iml

@@ -49,11 +49,11 @@ Before build plugin you must: <br>
 2. Unity must be closed while build is running.
 
 For build project you must run from terminal in `unity_plugin` directory of project<br>
-```groovy
+```bash
 ../gradlew clean buildPlugin
 ```
 On Windows run<br>
-```groovy
+```bash
 ..\gradlew.bat clean buildPlugin
 ```
 

README.md

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.14.4'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 

build.gradle

@@ -1,6 +1,6 @@
-#Thu Nov 27 14:33:46 EET 2014
+#Thu Dec 22 12:25:19 EET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -69,7 +69,7 @@ public class OpenIABEventManager : MonoBehaviour
     /**
      * Fired when transaction was restored
      */ 
-    public static event Action<string> transactionRestoredEvent;
+    public static event Action<Purchase> transactionRestoredEvent;
 
     /**
      * Fired when transaction restoration process failed
@@ -159,11 +159,11 @@ private void OnConsumePurchaseFailed(string error)
             consumePurchaseFailedEvent(error);
     }
 
-    public void OnTransactionRestored(string sku)
+    public void OnTransactionRestored(string json)
     {
         if (transactionRestoredEvent != null)
         {
-            transactionRestoredEvent(sku);
+            transactionRestoredEvent(new Purchase(json));
         }
     }
 
@@ -226,7 +226,8 @@ private void OnPurchaseFailed(string error)
     {
         if (purchaseFailedEvent != null)
         {
-            purchaseFailedEvent(-1, error);
+            // -1005 is similar to android "cancelled" code
+            purchaseFailedEvent(string.Equals(error, "Transaction cancelled")? -1005 : -1, error);
         }
     }
 
@@ -242,11 +243,11 @@ private void OnConsumePurchaseFailed(string error)
             consumePurchaseFailedEvent(error);
     }
 
-    public void OnPurchaseRestored(string sku)
+    public void OnPurchaseRestored(string json)
     {
         if (transactionRestoredEvent != null)
         {
-            transactionRestoredEvent(sku);
+            transactionRestoredEvent(new Purchase(json));
         }
     }
 

sample

@@ -99,6 +99,7 @@ public Purchase(string jsonString)
         public Purchase(JSON json) {
             ItemType = json.ToString("itemType");
             OrderId = json.ToString("orderId");
+            Receipt = json.ToString("receipt");
             PackageName = json.ToString("packageName");
             Sku = json.ToString("sku");
             PurchaseTime = json.ToLong("purchaseTime");

unity_plugin/unity_src/Assets/AssetStoreTools/Editor/AssetStoreToolsExtra.dll

@@ -76,7 +76,7 @@ bool Inventory_hasPurchase(const char* sku)
         NSUserDefaults *standardUserDefaults = [NSUserDefaults standardUserDefaults];
         if (standardUserDefaults)
         {
-            return [standardUserDefaults boolForKey:ToString(sku)];
+            return [[[standardUserDefaults dictionaryRepresentation] allKeys] containsObject:ToString(sku)];
         }
         else
         {