Merge lp:~karni/ubuntuone-android-music/fix-demo-purchase into lp:ubuntuone-android-music

[Michał Karnicki]

Only display purchase options in Ubuntu One customer mode. Otherwise, display learn-more style pages.

[Chad Miller (cmiller)]

review: Approve

=== modified file 'src/net/sourceforge/subsonic/androidapp/activity/StoreActivity.java'
--- src/net/sourceforge/subsonic/androidapp/activity/StoreActivity.java	2011-11-07 21:48:01 +0000
+++ src/net/sourceforge/subsonic/androidapp/activity/StoreActivity.java	2012-02-24 15:02:00 +0000
@@ -82,9 +82,15 @@
     private static final String UBUNTUONE_FROM_OAUTH_URL =
             UBUNTUONE_URL + "/api/1.0/from_oauth/";
     
+    private static final String LEARN_MORE_STREAMING_URL =
+    		UBUNTUONE_URL + "/services/music/?hide-hdft=1";
+    
     private static final String PURCHASE_STREAMING_URL =
             UBUNTUONE_URL + "/services/music-streaming/?hide-hdft=1";
     
+    private static final String LEARN_MORE_STORAGE_URL =
+    		UBUNTUONE_URL + "/services/free/?hide-hdft=1";
+    
     private static final String PURCHASE_STORAGE_URL =
             UBUNTUONE_URL + "/services/add-storage/?hide-hdft=1";
     
@@ -122,8 +128,22 @@
             return;
         }
         
-        mLoginTask = new LoginTask();
-        mLoginTask.execute();
+        int serverId = Util.getActiveServer(this);
+        if (serverId == Util.SERVER_ID_UBUNTUONE_CUSTOMER) {
+            mLoginTask = new LoginTask();
+            mLoginTask.execute();
+        } else {
+        	final Intent intent = getIntent();
+        	if (intent != null) {
+        		if (STORAGE.equals(intent.getStringExtra(KEY_PURCHASE))) {
+        			webView.loadUrl(LEARN_MORE_STORAGE_URL);
+        		} else {
+        			webView.loadUrl(LEARN_MORE_STREAMING_URL);
+        		}
+        	} else {
+        		webView.loadUrl(LEARN_MORE_STREAMING_URL);
+        	}
+        }
         
         mTracker = GoogleAnalyticsTracker.getInstance();
         mTracker.start(Analytics.ACCOUNT, this);