diff options
author | Andrew Dolgov <[email protected]> | 2014-10-15 21:11:37 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2014-10-15 21:11:37 +0400 |
commit | 34f23b9901c8a0e77e5147286035eac45e51fd10 (patch) | |
tree | b3076a877e4ce413cbab301cec106a389ec04e79 /src/org | |
parent | eae22a4771070ee5a79b1dd0976eb2a211f0dad0 (diff) |
remove unused amazon device check
Diffstat (limited to 'src/org')
-rw-r--r-- | src/org/fox/ttrss/CommonActivity.java | 4 | ||||
-rw-r--r-- | src/org/fox/ttrss/FeedsActivity.java | 6 | ||||
-rw-r--r-- | src/org/fox/ttrss/OnlineActivity.java | 25 |
3 files changed, 11 insertions, 24 deletions
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; |