summaryrefslogtreecommitdiff
path: root/org.fox.ttrss
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttrss')
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml4
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java2
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java32
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java7
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java5
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java2
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java11
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/headlines_row.xml2
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/headlines_row_compact.xml2
-rwxr-xr-xorg.fox.ttrss/src/main/res/values/style.xml2
10 files changed, 29 insertions, 40 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 9ebd56bc..24e221bb 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
- android:versionCode="313"
- android:versionName="1.90" >
+ android:versionCode="315"
+ android:versionName="1.91" >
<uses-sdk
android:minSdkVersion="15"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
index 00d0e536..6a394078 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
@@ -145,7 +145,7 @@ public class ArticlePager extends Fragment {
@Override
protected void onPostExecute(JsonElement result) {
- if (isDetached()) return;
+ if (isDetached() || !isAdded()) return;
super.onPostExecute(result);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
index bff85901..8b3251c8 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
@@ -8,10 +8,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
-import android.os.Parcelable;
import android.preference.PreferenceManager;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.widget.DrawerLayout;
@@ -27,6 +24,7 @@ import org.fox.ttrss.types.Article;
import org.fox.ttrss.types.ArticleList;
import org.fox.ttrss.types.Feed;
import org.fox.ttrss.types.FeedCategory;
+import org.fox.ttrss.widget.SmallWidgetProvider;
import java.util.Date;
import java.util.HashMap;
@@ -445,8 +443,8 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
intent.putExtra("feed", hf.getFeed());
intent.putExtra("article", article);
intent.putExtra("searchQuery", hf.getSearchQuery());
- //intent.putParcelableArrayListExtra("articles", hf.getArticles());
- intent.putExtra("articles", (Parcelable)hf.getAllArticles());
+ //intent.putExtra("articles", (Parcelable)hf.getAllArticles());
+ GlobalState.getInstance().tmpArticleList = hf.getAllArticles();
/* if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
startActivityForResult(intent, HEADLINES_REQUEST, ActivityOptions.makeSceneTransitionAnimation(this).toBundle());
@@ -454,16 +452,8 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
startActivityForResult(intent, HEADLINES_REQUEST);
} */
- if (!isPortrait() && !isSmallScreen()) {
- View sharedList = hf.getView().findViewById(R.id.headlines_list);
-
- ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedList, "TRANSITION:HEADLINES_LIST");
-
- ActivityCompat.startActivityForResult(this, intent, HEADLINES_REQUEST, options.toBundle());
- } else {
- // mysterious crashes if we use activitycompat here so welp
- startActivityForResult(intent, HEADLINES_REQUEST);
- }
+ // mysterious crashes somewhere in gl layer (?) on some feeds if we use activitycompat transitions here on LP so welp
+ startActivityForResult(intent, HEADLINES_REQUEST);
} else {
@@ -476,7 +466,15 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
}
}
- @Override
+ @Override
+ public void onStop() {
+ super.onStop();
+
+ Intent updateWidgetIntent = new Intent(SmallWidgetProvider.ACTION_REQUEST_UPDATE);
+ sendBroadcast(updateWidgetIntent);
+ }
+
+ @Override
public void onArticleSelected(Article article) {
onArticleSelected(article, true);
}
@@ -499,7 +497,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
//ArrayList<Article> tmp = data.getParcelableArrayListExtra("articles");
Article article = data.getParcelableExtra("activeArticle");
- ArticleList articles = data.getParcelableExtra("articles");
+ ArticleList articles = GlobalState.getInstance().tmpArticleList;
if (articles != null) {
HeadlinesFragment hf = (HeadlinesFragment)getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java
index bce416be..813142d9 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GlobalState.java
@@ -3,9 +3,10 @@ package org.fox.ttrss;
import android.app.Application;
import android.os.Bundle;
-import org.acra.ACRA;
import org.acra.ReportingInteractionMode;
import org.acra.annotation.ReportsCrashes;
+import org.fox.ttrss.types.ArticleList;
+
@ReportsCrashes(formKey = "", mode = ReportingInteractionMode.DIALOG,
excludeMatchingSharedPreferencesKeys = {"password"},
resDialogText = R.string.crash_dialog_text,
@@ -13,7 +14,7 @@ import org.acra.annotation.ReportsCrashes;
public class GlobalState extends Application {
private static GlobalState m_singleton;
- //public ArticleList m_loadedArticles = new ArticleList();
+ public ArticleList tmpArticleList;
//public Feed m_activeFeed;
//public Article m_activeArticle;
public int m_selectedArticleId;
@@ -28,7 +29,7 @@ public class GlobalState extends Application {
@Override
public final void onCreate() {
super.onCreate();
- ACRA.init(this);
+ //ACRA.init(this);
m_singleton = this;
}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
index 62c092e2..113fe533 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
@@ -7,7 +7,6 @@ import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.os.Bundle;
import android.os.Handler;
-import android.os.Parcelable;
import android.preference.PreferenceManager;
import android.support.v4.app.FragmentTransaction;
import android.util.Log;
@@ -79,7 +78,7 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
final Article article = i.getParcelableExtra("article");
final String searchQuery = i.getStringExtra("searchQuery");
- ArticleList tmp = i.getParcelableExtra("articles");
+ ArticleList tmp = GlobalState.getInstance().tmpArticleList;
if (tmp != null) {
m_articles.addAll(tmp);
@@ -309,7 +308,7 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
public void onBackPressed() {
Intent resultIntent = new Intent();
- resultIntent.putExtra("articles", (Parcelable) m_articles);
+ GlobalState.getInstance().tmpArticleList = m_articles;
resultIntent.putExtra("activeArticle", m_activeArticle);
setResult(Activity.RESULT_OK, resultIntent);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 14f0f1ff..3cb69c7f 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -494,7 +494,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
@Override
protected void onPostExecute(JsonElement result) {
- if (isDetached()) return;
+ if (isDetached() || !isAdded()) return;
if (getView() != null) {
ListView list = (ListView)getView().findViewById(R.id.headlines_list);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index da696509..d9ecaecb 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -45,7 +45,6 @@ import org.fox.ttrss.types.Article;
import org.fox.ttrss.types.ArticleList;
import org.fox.ttrss.types.Feed;
import org.fox.ttrss.types.Label;
-import org.fox.ttrss.widget.SmallWidgetProvider;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.select.Elements;
@@ -309,15 +308,7 @@ public class OnlineActivity extends CommonActivity {
return false;
}
-
- @Override
- public void onStop() {
- super.onStop();
-
- Intent initialUpdateIntent = new Intent(SmallWidgetProvider.ACTION_REQUEST_UPDATE);
- sendBroadcast(initialUpdateIntent);
- }
-
+
@Override
public void onPause() {
super.onPause();
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
index 7a490dd8..a0546db2 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -28,7 +28,7 @@
android:gravity="center_vertical"
android:singleLine="false"
android:text="Sample entry title"
- android:textColor="?headlineUnreadTextColor"
+ android:textColor="?headlineExcerptTextColor"
android:textSize="18sp"
android:paddingBottom="8dp"
android:layout_span="2" />
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
index 694afc64..5cc158b3 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
@@ -45,7 +45,7 @@
android:singleLine="true"
android:ellipsize="end"
android:text="Sample entry title"
- android:textColor="?headlineUnreadTextColor"
+ android:textColor="?headlineExcerptTextColor"
android:textSize="18sp"
android:layout_span="2" />
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index cd921f88..19e18983 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -96,7 +96,7 @@
<item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item>
<item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item>
<item name="headlineSelectedBackground">?feedsSelectedBackground</item>
- <item name="headlineUnreadBackground">@android:color/black</item>
+ <item name="headlineUnreadBackground">#101010</item>
<item name="linkColor">?colorPrimary</item>
<item name="loadingBackground">@android:color/black</item>
<item name="articleNoteTextColor">@android:color/secondary_text_dark</item>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-14 11:50:19 +0000