diff options
| -rw-r--r-- | res/xml/preferences.xml | 5 | ||||
| -rw-r--r-- | src/org/fox/ttrss/FeedsActivity.java | 1 | ||||
| -rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 2 | ||||
| -rw-r--r-- | src/org/fox/ttrss/PreferencesActivity.java | 5 | ||||
| -rw-r--r-- | src/org/fox/ttrss/types/Feed.java | 3 |
5 files changed, 5 insertions, 11 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 291a5ce5..d2bae786 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -95,11 +95,6 @@ android:title="@string/combined_mode" />
<CheckBoxPreference
- android:defaultValue="false"
- android:key="tablet_article_swipe"
- android:title="@string/tablet_article_swipe" />
-
- <CheckBoxPreference
android:defaultValue="true"
android:key="justify_article_text"
android:title="@string/justify_article_text" />
diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java index b3f4a3da..1fd09d80 100644 --- a/src/org/fox/ttrss/FeedsActivity.java +++ b/src/org/fox/ttrss/FeedsActivity.java @@ -225,6 +225,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe //intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+ overridePendingTransition(android.R.anim.slide_in_left, android.R.anim.slide_out_right);
startActivityForResult(intent, 0);
}
} else {
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 4ca85661..a42127ee 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -359,7 +359,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, final boolean isCat = m_feed.is_cat;
int skip = 0;
- if (!m_feed.equals(TinyApplication.getInstance())) {
+ if (!m_feed.equals(TinyApplication.getInstance().m_activeFeed)) {
append = false;
}
diff --git a/src/org/fox/ttrss/PreferencesActivity.java b/src/org/fox/ttrss/PreferencesActivity.java index 41fb00f2..2278ad0f 100644 --- a/src/org/fox/ttrss/PreferencesActivity.java +++ b/src/org/fox/ttrss/PreferencesActivity.java @@ -20,11 +20,6 @@ public class PreferencesActivity extends PreferenceActivity { addPreferencesFromResource(R.xml.preferences);
- if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) != Configuration.SCREENLAYOUT_SIZE_XLARGE) {
- PreferenceCategory category = (PreferenceCategory)findPreference("category_look_and_feel");
- category.removePreference(findPreference("tablet_article_swipe"));
- }
-
findPreference("justify_article_text").setEnabled(!prefs.getBoolean("combined_mode", false));
findPreference("combined_mode").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
diff --git a/src/org/fox/ttrss/types/Feed.java b/src/org/fox/ttrss/types/Feed.java index 5227468f..c0649be3 100644 --- a/src/org/fox/ttrss/types/Feed.java +++ b/src/org/fox/ttrss/types/Feed.java @@ -32,6 +32,9 @@ public class Feed implements Comparable<Feed>, Parcelable { if (feed == this)
return true;
+ if (feed == null)
+ return false;
+
return feed.id == this.id && (this.title == null || this.title.equals(feed.title)) && this.is_cat == feed.is_cat;
}
|