Remove the WebMarketStrategy

astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java

@@ -14,7 +14,6 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,6 +21,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.timsu.astrid.R;
 import com.todoroo.astrid.data.AddOn;
@@ -41,8 +41,6 @@ public class AddOnAdapter extends ArrayAdapter<AddOn> {
     private final Activity activity;
     private final LayoutInflater inflater;
     private final boolean installed;
-    public static final Intent ALTERNATE_MARKET_INTENT = new Intent(Intent.ACTION_VIEW,
-            Uri.parse("http://weloveastrid.com/store")); //$NON-NLS-1$
 
     public AddOnAdapter(Activity activity, boolean installed, List<AddOn> objects) {
         super(activity, R.id.title, objects);
@@ -63,7 +61,7 @@ public class AddOnAdapter extends ArrayAdapter<AddOn> {
                     activity.startActivity(buttonTag.intent);
                     StatisticsService.reportEvent("addon-" + buttonTag.event); //$NON-NLS-1$
                 } catch (ActivityNotFoundException e) {
-                    activity.startActivity(ALTERNATE_MARKET_INTENT);
+                    Toast.makeText(activity, R.string.market_unavailable, Toast.LENGTH_LONG).show();
                 }
             }
         }

astrid/src/com/todoroo/astrid/data/AddOn.java

@@ -21,18 +21,16 @@ public class AddOn {
     private final String author;
     private final String description;
     private final String packageName;
-    private final String webPage;
     private final Bitmap icon;
 
     public AddOn(boolean free, boolean internal, String title, String author, String description,
-            String packageName, String webPage, Bitmap icon) {
+            String packageName, Bitmap icon) {
         this.free = free;
         this.internal = internal;
         this.title = title;
         this.author = author;
         this.description = description;
         this.packageName = packageName;
-        this.webPage = webPage;
         this.icon = icon;
     }
 
@@ -78,13 +76,6 @@ public class AddOn {
         return packageName;
     }
 
-    /**
-     * @return add-on web-page
-     */
-    public String getWebPage() {
-        return webPage;
-    }
-
     /**
      * @return add-on icon
      */

astrid/src/com/todoroo/astrid/service/AddOnService.java

@@ -141,13 +141,13 @@ public class AddOnService {
         if(Constants.MARKET_STRATEGY.includesPowerPack())
             list.add(new AddOn(false, true, r.getString(R.string.AOA_ppack_title), null,
                 r.getString(R.string.AOA_ppack_description),
-                POWER_PACK_PACKAGE, "http://www.weloveastrid.com/store",
+                POWER_PACK_PACKAGE,
                 ((BitmapDrawable)r.getDrawable(R.drawable.icon_pp)).getBitmap()));
 
         if(Constants.MARKET_STRATEGY.includesLocalePlugin())
             list.add(new AddOn(false, true, r.getString(R.string.AOA_locale_title), null,
                 r.getString(R.string.AOA_locale_description),
-                LOCALE_PACKAGE, "http://www.weloveastrid.com/store",
+                LOCALE_PACKAGE,
                 ((BitmapDrawable)r.getDrawable(R.drawable.icon_locale)).getBitmap()));
 
         return list.toArray(new AddOn[list.size()]);

astrid/src/com/todoroo/astrid/service/MarketStrategy.java

@@ -103,21 +103,6 @@ public abstract class MarketStrategy {
 
     }
 
-    public static class WebMarketStrategy extends MarketStrategy {
-
-        @Override
-        public Intent generateMarketLink(String packageName) {
-            return new Intent(Intent.ACTION_VIEW,
-                    Uri.parse("http://weloveastrid.com/store")); //$NON-NLS-1$
-        }
-
-        @Override
-        public String strategyId() {
-            return "web_market"; //$NON-NLS-1$
-        }
-
-    }
-
     public static class AmazonMarketStrategy extends MarketStrategy {
 
         @Override

build.xml

@@ -77,14 +77,6 @@
     </subant>  
   </target>
     
-  <target name="release-webmarket" depends="get-version">
-    <subant target="release-custom">
-      <fileset file="astrid/build.xml" />
-      <property name="custom.version.name" value="-web-market" />
-      <property name="custom.market.strategy" value="WebMarketStrategy" />
-    </subant>
-  </target>
-
   <target name="release-lite" depends="get-version">
     <subant target="release-lite">
       <fileset file="astrid/build.xml" />