Merged '5fdc829' from release-2.4: Link to amazon store instead of pl…

…ay when amazon device
elliotcathcart · Jan 30, 2015 · bce3cdb · bce3cdb
2 parents 1ff7b50 + 5fdc829
commit bce3cdb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.java b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.java
@@ -307,6 +307,10 @@ public static boolean isChromebook() {
         return android.os.Build.BRAND.equalsIgnoreCase("chromium") || android.os.Build.MANUFACTURER.equalsIgnoreCase("chromium");
     }
 
+    public static boolean isKindle() {
+        return Build.BRAND.equalsIgnoreCase("amazon") || Build.MANUFACTURER.equalsIgnoreCase("amazon");
+    }
+
 
     /**
      * Convenience method for accessing Shared preferences

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Info.java b/AnkiDroid/src/main/java/com/ichi2/anki/Info.java
@@ -157,8 +157,14 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onClick(View arg0) {
                 if (mType == TYPE_ABOUT) {
-                    Info.this.startActivity(new Intent(Intent.ACTION_VIEW, Uri
-                            .parse("market://details?id=com.ichi2.anki")));
+                    if (AnkiDroidApp.isKindle()) {
+                        Intent intent = new Intent("android.intent.action.VIEW",
+                                Uri.parse("http://www.amazon.com/gp/mas/dl/android?p=com.ichi2.anki"));
+                        startActivity(intent);
+                    } else {
+                        Info.this.startActivity(new Intent(Intent.ACTION_VIEW, Uri
+                                .parse("market://details?id=com.ichi2.anki")));
+                    }
                     return;
                 }
                 setResult(RESULT_OK);