Merge remote-tracking branch 'emma/ThreeOne' into ThreeOne

chovus · Jun 14, 2012 · f33c4c0 · f33c4c0
2 parents 06946df + 730cd84
commit f33c4c0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/examples/cpp/PurchaseExample/ApplicationController.h b/examples/cpp/PurchaseExample/ApplicationController.h
@@ -19,7 +19,7 @@
 /**
  * @file ApplicationController.h
  *
- * @brief  The controller that handles all purchase related
+ * @brief  The controller that handles all purchase related events.
  * The controller is responsible for updating the UI with all
  * purchase events.
  * @author Emma Tresanszki

diff --git a/examples/cpp/PurchaseExample/Main.cpp b/examples/cpp/PurchaseExample/Main.cpp
@@ -72,23 +72,21 @@ class NativeUIMoblet : public Moblet
 		}
 		else
 		{
-			if ( platform == ANDROID )
+			if ( platform == ANDROID && developerKey.size() == 0 )
 			{
-				if (developerKey.size() == 0 )
-				{
-					maAlert("Error", "You need to set developer key in Config.h ",
-						"OK", NULL, NULL);
-				}
-				else if ( PurchaseManager::getInstance()->setPublicKey(DEVELOPER_PUBLIC_KEY)
+				maAlert("Error", "You need to set developer key in Config.h ",
+					"OK", NULL, NULL);
+			}
+			else if ( platform == ANDROID &&
+					PurchaseManager::getInstance()->setPublicKey(DEVELOPER_PUBLIC_KEY)
 						== MA_PURCHASE_RES_MALFORMED_PUBLIC_KEY )
-				{
-					maAlert("Error", "Malformed developer key in Config.h ",
-						"OK", NULL, NULL);
-				}
-				else
-				{
-					mController = new ApplicationController();
-				}
+			{
+				maAlert("Error", "Malformed developer key in Config.h ",
+					"OK", NULL, NULL);
+			}
+			else
+			{
+				mController = new ApplicationController();
 			}
 		}
 	}