diff options
| author | Andrew Dolgov <[email protected]> | 2012-09-19 22:57:10 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-09-19 22:57:10 +0400 |
| commit | 9479fac206fa461ca3589d060b60e3ca36a5d715 (patch) | |
| tree | b44ca961e089c515642b77d7043a08a0b613d1ca /src/org | |
| parent | 0148a203696a262a8902743848828fe38343b3d1 (diff) | |
disable combined mode because of lack of images and performance issues
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 2 | ||||
| -rw-r--r-- | src/org/fox/ttrss/OnlineActivity.java | 12 | ||||
| -rw-r--r-- | src/org/fox/ttrss/PreferencesActivity.java | 4 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 2 |
4 files changed, 14 insertions, 6 deletions
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 0621c64f..d5cd7bf4 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -315,7 +315,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, m_activity = (OnlineActivity) activity;
m_listener = (HeadlinesEventListener) activity;
- m_combinedMode = m_prefs.getBoolean("combined_mode", false);
+ m_combinedMode = false; /* m_prefs.getBoolean("combined_mode", false); */
}
@Override
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java index de3c0de6..fcb8e05d 100644 --- a/src/org/fox/ttrss/OnlineActivity.java +++ b/src/org/fox/ttrss/OnlineActivity.java @@ -433,6 +433,16 @@ public class OnlineActivity extends CommonActivity { if (hasPendingOfflineData())
syncOfflineData();
+ List<PackageInfo> 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
|