iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove unused amazon device check

Browse Source
This commit is contained in:
Andrew Dolgov 2014-10-15 21:11:37 +04:00
parent eae22a4771
commit 34f23b9901
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/fox/ttrss/CommonActivity.java
View File

@ -50,10 +50,6 @@ public class CommonActivity extends ActionBarActivity {
return m_prefs.getBoolean("show_unread_only", true); return m_prefs.getBoolean("show_unread_only", true);
} }
public static boolean isAmazonDevice() {
return android.os.Build.MANUFACTURER.equals("Amazon");
}
public void setUnreadOnly(boolean unread) { public void setUnreadOnly(boolean unread) {
SharedPreferences.Editor editor = m_prefs.edit(); SharedPreferences.Editor editor = m_prefs.edit();
editor.putBoolean("show_unread_only", unread); editor.putBoolean("show_unread_only", unread);

6
src/org/fox/ttrss/FeedsActivity.java
View File

@ -149,10 +149,8 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
ft.commit(); ft.commit();
if (!isAmazonDevice()) { AppRater.appLaunched(this);
AppRater.appLaunched(this); checkTrial(true);
checkTrial(true);
}
} else { // savedInstanceState != null } else { // savedInstanceState != null
m_actionbarUpEnabled = savedInstanceState.getBoolean("actionbarUpEnabled"); m_actionbarUpEnabled = savedInstanceState.getBoolean("actionbarUpEnabled");

25
src/org/fox/ttrss/OnlineActivity.java
View File

@ -176,10 +176,7 @@ public class OnlineActivity extends CommonActivity {
if (isOffline) { if (isOffline) {
switchOfflineSuccess(); switchOfflineSuccess();
} else { } else {
checkTrial(false);
if (!isAmazonDevice()) {
checkTrial(false);
}
/* if (getIntent().getExtras() != null) { /* if (getIntent().getExtras() != null) {
Intent i = getIntent(); Intent i = getIntent();
@ -1261,19 +1258,15 @@ public class OnlineActivity extends CommonActivity {
initMenu(); initMenu();
if (!isAmazonDevice()) { List<PackageInfo> pkgs = getPackageManager()
List<PackageInfo> pkgs = getPackageManager() .getInstalledPackages(0);
.getInstalledPackages(0);
for (PackageInfo p : pkgs) {
for (PackageInfo p : pkgs) { if ("org.fox.ttrss.key".equals(p.packageName)) {
if ("org.fox.ttrss.key".equals(p.packageName)) { Log.d(TAG, "license apk found");
Log.d(TAG, "license apk found"); menu.findItem(R.id.donate).setVisible(false);
menu.findItem(R.id.donate).setVisible(false); break;
break;
}
} }
} else {
menu.findItem(R.id.donate).setVisible(false);
} }
return true; return true;