disable trial stuff on amazon devices

This commit is contained in:
Andrew Dolgov 2013-11-21 09:39:43 +04:00
parent f955dac12b
commit d4caac40d4
3 changed files with 24 additions and 11 deletions

View File

@ -44,6 +44,10 @@ public class CommonActivity extends SherlockFragmentActivity {
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);

View File

@ -127,8 +127,10 @@ 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");

View File

@ -173,7 +173,10 @@ public class OnlineActivity extends CommonActivity {
if (isOffline) { if (isOffline) {
switchOfflineSuccess(); switchOfflineSuccess();
} else { } else {
if (!isAmazonDevice()) {
checkTrial(false); checkTrial(false);
}
/* if (getIntent().getExtras() != null) { /* if (getIntent().getExtras() != null) {
Intent i = getIntent(); Intent i = getIntent();
@ -1226,6 +1229,7 @@ public class OnlineActivity extends CommonActivity {
initMenu(); initMenu();
if (!isAmazonDevice()) {
List<PackageInfo> pkgs = getPackageManager() List<PackageInfo> pkgs = getPackageManager()
.getInstalledPackages(0); .getInstalledPackages(0);
@ -1236,6 +1240,9 @@ public class OnlineActivity extends CommonActivity {
break; break;
} }
} }
} else {
menu.findItem(R.id.donate).setVisible(false);
}
return true; return true;
} }