diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 400d8a6d..d6b81026 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -88,11 +88,11 @@ android:summary="@string/browse_cats_like_feeds_summary" android:title="@string/browse_cats_like_feeds" /> - + android:title="@string/combined_mode" /> --> pkgs = getPackageManager() + .getInstalledPackages(0); + + for (PackageInfo p : pkgs) { + if ("org.fox.ttrss.key".equals(p.packageName)) { + toast(R.string.donate_thanks); + break; + } + } + finish(); } @@ -879,11 +889,9 @@ public class OnlineActivity extends CommonActivity { if ("org.fox.ttrss.key".equals(p.packageName)) { Log.d(TAG, "license apk found"); menu.findItem(R.id.donate).setVisible(false); - toast(R.string.donate_thanks); break; } } - return true; } diff --git a/src/org/fox/ttrss/PreferencesActivity.java b/src/org/fox/ttrss/PreferencesActivity.java index 0568d813..5a7a28fb 100644 --- a/src/org/fox/ttrss/PreferencesActivity.java +++ b/src/org/fox/ttrss/PreferencesActivity.java @@ -20,12 +20,12 @@ public class PreferencesActivity extends PreferenceActivity { findPreference("justify_article_text").setEnabled(!prefs.getBoolean("combined_mode", false)); - findPreference("combined_mode").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + /* findPreference("combined_mode").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { findPreference("justify_article_text").setEnabled(!newValue.toString().equals("true")); return true; } - }); + }); */ } } diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index b7817ac6..158e36cd 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -322,7 +322,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis m_activity = (OfflineActivity) activity; m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); - m_combinedMode = m_prefs.getBoolean("combined_mode", false); + m_combinedMode = false; /* m_prefs.getBoolean("combined_mode", false); */ } @Override