summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/CommonActivity.java19
-rw-r--r--src/org/fox/ttrss/HeadlinesFragment.java8
-rw-r--r--src/org/fox/ttrss/MainActivity.java52
-rw-r--r--src/org/fox/ttrss/PreferencesActivity.java5
-rw-r--r--src/org/fox/ttrss/offline/OfflineActivity.java4
-rw-r--r--src/org/fox/ttrss/types/Article.java4
-rw-r--r--src/org/fox/ttrss/types/Attachment.java4
-rw-r--r--src/org/fox/ttrss/types/Feed.java4
-rw-r--r--src/org/fox/ttrss/types/FeedCategory.java4
-rw-r--r--src/org/fox/ttrss/types/Label.java4
10 files changed, 82 insertions, 26 deletions
diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java
index f0b678ae..3e254535 100644
--- a/src/org/fox/ttrss/CommonActivity.java
+++ b/src/org/fox/ttrss/CommonActivity.java
@@ -2,8 +2,10 @@ package org.fox.ttrss;
import org.fox.ttrss.util.DatabaseHelper;
+import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.support.v4.app.FragmentActivity;
import android.util.DisplayMetrics;
import android.util.FloatMath;
@@ -19,6 +21,8 @@ public class CommonActivity extends FragmentActivity {
public final static String FRAG_FEEDS = "feeds";
public final static String FRAG_CATS = "cats";
+ private SharedPreferences m_prefs;
+
private SQLiteDatabase m_readableDb;
private SQLiteDatabase m_writableDb;
@@ -31,6 +35,16 @@ public class CommonActivity extends FragmentActivity {
m_smallScreenMode = smallScreen;
}
+ public void toast(int msgId) {
+ Toast toast = Toast.makeText(CommonActivity.this, msgId, Toast.LENGTH_SHORT);
+ toast.show();
+ }
+
+ public void toast(String msg) {
+ Toast toast = Toast.makeText(CommonActivity.this, msg, Toast.LENGTH_SHORT);
+ toast.show();
+ }
+
protected void detectSmallTablet() {
DisplayMetrics displayMetrics = new DisplayMetrics();
@@ -41,7 +55,7 @@ public class CommonActivity extends FragmentActivity {
float inDiag = FloatMath.sqrt(inHeight * inHeight + inWidth * inWidth);
- if (inDiag < 9) {
+ if (inDiag < 9 || m_prefs.getBoolean("force_small_tablet_ui", false)) {
m_smallTablet = true;
}
@@ -78,6 +92,9 @@ public class CommonActivity extends FragmentActivity {
m_compatMode = android.os.Build.VERSION.SDK_INT <= 10;
+ m_prefs = PreferenceManager
+ .getDefaultSharedPreferences(getApplicationContext());
+
Log.d(TAG, "m_compatMode=" + m_compatMode);
detectSmallTablet();
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index c8d0ce2d..4cb77858 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -658,6 +658,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
return m_adapter.getItem(position);
} catch (IndexOutOfBoundsException e) {
return null;
+ } catch (NullPointerException e) {
+ return null;
}
}
@@ -694,7 +696,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
}
public int getArticlePosition(Article article) {
- return m_adapter.getPosition(article);
+ try {
+ return m_adapter.getPosition(article);
+ } catch (NullPointerException e) {
+ return -1;
+ }
}
public void setSearchQuery(String query) {
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index bb72543c..1ac736e2 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -183,15 +183,17 @@ public class MainActivity extends CommonActivity implements OnlineServices {
if (m_activeFeed.is_cat) {
FeedCategoriesFragment cats = (FeedCategoriesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_CATS);
- ft.show(cats);
-
- cats.setSelectedCategory(null);
+ if (cats != null) {
+ ft.show(cats);
+ cats.setSelectedCategory(null);
+ }
} else {
FeedsFragment feeds = (FeedsFragment) getSupportFragmentManager().findFragmentByTag(FRAG_FEEDS);
-
- ft.show(feeds);
-
- feeds.setSelectedFeed(null);
+
+ if (feeds != null) {
+ ft.show(feeds);
+ feeds.setSelectedFeed(null);
+ }
}
} else {
@@ -307,8 +309,7 @@ public class MainActivity extends CommonActivity implements OnlineServices {
refresh();
- Toast toast = Toast.makeText(MainActivity.this, R.string.offline_sync_success, Toast.LENGTH_SHORT);
- toast.show();
+ toast(R.string.offline_sync_success);
}
}
@@ -381,7 +382,11 @@ public class MainActivity extends CommonActivity implements OnlineServices {
@SuppressWarnings({ "unchecked", "serial" })
public void saveArticleMarked(final Article article) {
- ApiRequest req = new ApiRequest(getApplicationContext());
+ ApiRequest req = new ApiRequest(getApplicationContext()) {
+ protected void onPostExecute(JsonElement result) {
+ toast(article.marked ? R.string.notify_article_marked : R.string.notify_article_unmarked);
+ }
+ };
HashMap<String, String> map = new HashMap<String, String>() {
{
@@ -392,13 +397,18 @@ public class MainActivity extends CommonActivity implements OnlineServices {
put("field", "0");
}
};
-
+
req.execute(map);
}
@SuppressWarnings({ "unchecked", "serial" })
public void saveArticlePublished(final Article article) {
- ApiRequest req = new ApiRequest(getApplicationContext());
+
+ ApiRequest req = new ApiRequest(getApplicationContext()) {
+ protected void onPostExecute(JsonElement result) {
+ toast(article.published ? R.string.notify_article_published : R.string.notify_article_unpublished);
+ }
+ };
HashMap<String, String> map = new HashMap<String, String>() {
{
@@ -415,7 +425,11 @@ public class MainActivity extends CommonActivity implements OnlineServices {
@SuppressWarnings({ "unchecked", "serial" })
public void saveArticleNote(final Article article, final String note) {
- ApiRequest req = new ApiRequest(getApplicationContext());
+ ApiRequest req = new ApiRequest(getApplicationContext()) {
+ protected void onPostExecute(JsonElement result) {
+ toast(R.string.notify_article_note_set);
+ }
+ };
HashMap<String, String> map = new HashMap<String, String>() {
{
@@ -1017,10 +1031,14 @@ public class MainActivity extends CommonActivity implements OnlineServices {
if (m_activeFeed.is_cat) {
FeedCategoriesFragment cats = (FeedCategoriesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_CATS);
- cats.setSelectedCategory(null);
+ if (cats != null) {
+ cats.setSelectedCategory(null);
+ }
} else {
FeedsFragment feeds = (FeedsFragment) getSupportFragmentManager().findFragmentByTag(FRAG_FEEDS);
- feeds.setSelectedFeed(null);
+ if (feeds != null) {
+ feeds.setSelectedFeed(null);
+ }
}
m_activeFeed = null;
@@ -1397,8 +1415,8 @@ public class MainActivity extends CommonActivity implements OnlineServices {
Intent intent = new Intent(Intent.ACTION_SEND);
intent.setType("text/plain");
- //intent.putExtra(Intent.EXTRA_SUBJECT, article.title);
- intent.putExtra(Intent.EXTRA_TEXT, article.title + " " + article.link);
+ intent.putExtra(Intent.EXTRA_SUBJECT, article.title);
+ intent.putExtra(Intent.EXTRA_TEXT, article.link);
return intent;
}
diff --git a/src/org/fox/ttrss/PreferencesActivity.java b/src/org/fox/ttrss/PreferencesActivity.java
index 41fb00f2..017888f9 100644
--- a/src/org/fox/ttrss/PreferencesActivity.java
+++ b/src/org/fox/ttrss/PreferencesActivity.java
@@ -19,11 +19,6 @@ public class PreferencesActivity extends PreferenceActivity {
.getDefaultSharedPreferences(getApplicationContext());
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));
diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java
index 82241c89..4e48a4da 100644
--- a/src/org/fox/ttrss/offline/OfflineActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineActivity.java
@@ -569,8 +569,8 @@ public class OfflineActivity extends CommonActivity implements
Intent intent = new Intent(Intent.ACTION_SEND);
intent.setType("text/plain");
- //intent.putExtra(Intent.EXTRA_SUBJECT, title);
- intent.putExtra(Intent.EXTRA_TEXT, title + " " + link);
+ intent.putExtra(Intent.EXTRA_SUBJECT, title);
+ intent.putExtra(Intent.EXTRA_TEXT, link);
return intent;
}
diff --git a/src/org/fox/ttrss/types/Article.java b/src/org/fox/ttrss/types/Article.java
index 2ad86e91..bf9614e8 100644
--- a/src/org/fox/ttrss/types/Article.java
+++ b/src/org/fox/ttrss/types/Article.java
@@ -27,6 +27,10 @@ public class Article implements Parcelable {
readFromParcel(in);
}
+ public Article() {
+
+ }
+
public Article(int id) {
this.id = id;
this.title = "";
diff --git a/src/org/fox/ttrss/types/Attachment.java b/src/org/fox/ttrss/types/Attachment.java
index 7b77d5db..58e5b37f 100644
--- a/src/org/fox/ttrss/types/Attachment.java
+++ b/src/org/fox/ttrss/types/Attachment.java
@@ -19,6 +19,10 @@ public class Attachment implements Parcelable {
readFromParcel(in);
}
+ public Attachment() {
+
+ }
+
@Override
public int describeContents() {
return 0;
diff --git a/src/org/fox/ttrss/types/Feed.java b/src/org/fox/ttrss/types/Feed.java
index 25077686..91d12308 100644
--- a/src/org/fox/ttrss/types/Feed.java
+++ b/src/org/fox/ttrss/types/Feed.java
@@ -24,6 +24,10 @@ public class Feed implements Comparable<Feed>, Parcelable {
readFromParcel(in);
}
+ public Feed() {
+
+ }
+
@Override
public int compareTo(Feed feed) {
if (feed.unread != this.unread)
diff --git a/src/org/fox/ttrss/types/FeedCategory.java b/src/org/fox/ttrss/types/FeedCategory.java
index d4f68bfb..202a2dd6 100644
--- a/src/org/fox/ttrss/types/FeedCategory.java
+++ b/src/org/fox/ttrss/types/FeedCategory.java
@@ -20,6 +20,10 @@ public class FeedCategory implements Parcelable {
this.order_id = 0;
}
+ public FeedCategory() {
+
+ }
+
@Override
public int describeContents() {
return 0;
diff --git a/src/org/fox/ttrss/types/Label.java b/src/org/fox/ttrss/types/Label.java
index fd4ce930..ff81ffa6 100644
--- a/src/org/fox/ttrss/types/Label.java
+++ b/src/org/fox/ttrss/types/Label.java
@@ -6,4 +6,8 @@ public class Label {
public String fg_color;
public String bg_color;
public boolean checked;
+
+ public Label() {
+
+ }
}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-16 23:04:18 +0000