From 34f23b9901c8a0e77e5147286035eac45e51fd10 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 15 Oct 2014 21:11:37 +0400
Subject: remove unused amazon device check

---
 src/org/fox/ttrss/CommonActivity.java |  4 ----
 src/org/fox/ttrss/FeedsActivity.java  |  6 ++----
 src/org/fox/ttrss/OnlineActivity.java | 25 +++++++++----------------
 3 files changed, 11 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java
index bfe70708..cff87129 100644
--- a/src/org/fox/ttrss/CommonActivity.java
+++ b/src/org/fox/ttrss/CommonActivity.java
@@ -50,10 +50,6 @@ public class CommonActivity extends ActionBarActivity {
 		return m_prefs.getBoolean("show_unread_only", true);
 	}
 
-	public static boolean isAmazonDevice() {
-		return android.os.Build.MANUFACTURER.equals("Amazon");
-	}
-	
 	public void setUnreadOnly(boolean unread) {
 		SharedPreferences.Editor editor = m_prefs.edit();
 		editor.putBoolean("show_unread_only", unread);
diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java
index 68f7fc45..0262c6be 100644
--- a/src/org/fox/ttrss/FeedsActivity.java
+++ b/src/org/fox/ttrss/FeedsActivity.java
@@ -149,10 +149,8 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
 
 			ft.commit();
 				
-			if (!isAmazonDevice()) {
-				AppRater.appLaunched(this);
-				checkTrial(true);
-			}
+			AppRater.appLaunched(this);
+			checkTrial(true);
 
 		} else { // savedInstanceState != null
 			m_actionbarUpEnabled = savedInstanceState.getBoolean("actionbarUpEnabled");
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java
index e19bbd0c..02d00d1f 100644
--- a/src/org/fox/ttrss/OnlineActivity.java
+++ b/src/org/fox/ttrss/OnlineActivity.java
@@ -176,10 +176,7 @@ public class OnlineActivity extends CommonActivity {
 		if (isOffline) {
 			switchOfflineSuccess();			
 		} else {
-			
-			if (!isAmazonDevice()) {
-				checkTrial(false);
-			}
+			checkTrial(false);
 			
 			/* if (getIntent().getExtras() != null) {
 				Intent i = getIntent();
@@ -1261,19 +1258,15 @@ public class OnlineActivity extends CommonActivity {
 
 		initMenu();
 		
-		if (!isAmazonDevice()) {
-			List<PackageInfo> pkgs = getPackageManager()
-					.getInstalledPackages(0);
-	
-			for (PackageInfo p : pkgs) {
-				if ("org.fox.ttrss.key".equals(p.packageName)) {
-					Log.d(TAG, "license apk found");
-					menu.findItem(R.id.donate).setVisible(false);
-					break;
-				}
+		List<PackageInfo> pkgs = getPackageManager()
+				.getInstalledPackages(0);
+
+		for (PackageInfo p : pkgs) {
+			if ("org.fox.ttrss.key".equals(p.packageName)) {
+				Log.d(TAG, "license apk found");
+				menu.findItem(R.id.donate).setVisible(false);
+				break;
 			}
-		} else {
-			menu.findItem(R.id.donate).setVisible(false);
 		}
 		
 		return true;
-- 
cgit v1.2.3