Skip to content
This repository was archived by the owner on Nov 28, 2024. It is now read-only.

Fix refresh starred #21

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix refresh starred #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4ca819
Add support for theoldreader.com
scastrorico Mar 26, 2016
620ebd3
Fix empty unread messages list after refresh
scastrorico Mar 27, 2016
31ca466
Fix images not shown in article view
scastrorico Mar 30, 2016
221004e
Fix 404 when refresh starred post
scastrorico Apr 20, 2016
629ab6c
Merge remote-tracking branch 'upstream/master'
scastrorico Apr 24, 2016
06d28e8
Merge branch 'master' into fix-refresh-starred
scastrorico Apr 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
<classpath>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="libs/HtmlCleaner/src"/>
<classpathentry kind="src" path="libs/jackson-core/src/main/java"/>
<classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="org.eclipse.andmore.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="org.eclipse.andmore.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="org.eclipse.andmore.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
16 changes: 16 additions & 0 deletions .project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.andmore.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.andmore.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
Expand All @@ -25,8 +35,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.andmore.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.andmore.AndroidNature</nature>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
Expand Down
2 changes: 1 addition & 1 deletion project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# project structure.

# Project target.
target=android-19
target=android-22
54 changes: 27 additions & 27 deletions res/values-ja/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="SettingItemSync">
<item>WLAN有りの時のみ自動同期</item>
<item>ネットワーク有りの時のみ自動同期</item>
<item>自動同期オフ</item>
</string-array>
<string-array name="SettingImageFetching">
<item>WLAN有りの時のみ画像をダウロード</item>
<item>ネットワーク有りの時のみ画像をダウロード</item>
<item>画像をダウロードしない</item>
</string-array>
<string-array name="SettingTheme">
<item>デフォルトテーマ</item>
<item>ナイトモード</item>
</string-array>
<string-array name="SettingSyncInterval">
<item>1時間</item>
<item>2時間</item>
<item>3時間</item>
<item>4時間</item>
<item>6時間</item>
<item>20分</item>
<item>30分</item>
</string-array>
<?xml version="1.0" encoding="utf-8"?>
<resources>

<string-array name="SettingItemSync">
<item>WLAN有りの時のみ自動同期</item>
<item>ネットワーク有りの時のみ自動同期</item>
<item>自動同期オフ</item>
</string-array>
<string-array name="SettingImageFetching">
<item>WLAN有りの時のみ画像をダウロード</item>
<item>ネットワーク有りの時のみ画像をダウロード</item>
<item>画像をダウロードしない</item>
</string-array>
<string-array name="SettingTheme">
<item>デフォルトテーマ</item>
<item>ナイトモード</item>
</string-array>
<string-array name="SettingSyncInterval">
<item>1時間</item>
<item>2時間</item>
<item>3時間</item>
<item>4時間</item>
<item>6時間</item>
<item>20分</item>
<item>30分</item>
</string-array>

</resources>
246 changes: 123 additions & 123 deletions res/values-ja/strings.xml
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="pageBackground" format="reference" />
<attr name="textColor" format="reference" />
<attr name="listItemBackground" format="reference" />
<attr name="listItemUnclickableBackground" format="reference" />
<attr name="listItemArrow" format="reference" />
<attr name="itemTitleTextColor" format="reference" />
<attr name="itemLastNextBackground" format="reference" />
<attr name="itemLastNextTextColor" format="reference" />
<attr name="itemLastBorderColor" format="reference" />
<attr name="itemNextBorderColor" format="reference" />
<attr name="itemBottomLineBackground" format="reference" />
<attr name="itemBottomMenuBackground" format="reference" />
<attr name="itemButtonMobilizedViewBackground" format="reference" />
<attr name="itemButtonOriginalViewBackground" format="reference" />
<attr name="verticalScrollView" format="reference" />
<?xml version="1.0" encoding="utf-8"?>
<resources>

<attr name="pageBackground" format="reference" />
<attr name="textColor" format="reference" />
<attr name="listItemBackground" format="reference" />
<attr name="listItemUnclickableBackground" format="reference" />
<attr name="listItemArrow" format="reference" />
<attr name="itemTitleTextColor" format="reference" />
<attr name="itemLastNextBackground" format="reference" />
<attr name="itemLastNextTextColor" format="reference" />
<attr name="itemLastBorderColor" format="reference" />
<attr name="itemNextBorderColor" format="reference" />
<attr name="itemBottomLineBackground" format="reference" />
<attr name="itemBottomMenuBackground" format="reference" />
<attr name="itemButtonMobilizedViewBackground" format="reference" />
<attr name="itemButtonOriginalViewBackground" format="reference" />
<attr name="verticalScrollView" format="reference" />

</resources>
1 change: 1 addition & 0 deletions src/org/freshrss/easyrss/VerticalSingleItemView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import android.webkit.JsResult;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebSettings.RenderPriority;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.CheckBox;
Expand Down
12 changes: 12 additions & 0 deletions src/org/freshrss/easyrss/network/GlobalItemDataSyncer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;

Expand Down Expand Up @@ -250,6 +252,16 @@ public void onItemIdRetrieved(final ItemId itemId) throws IOException {
itemIds.add(itemId);
}
});

// Sort ItemIds by timestamp (Downward). That prevents mark all
// items as read if they are disordered.
Collections.sort(itemIds, new Comparator<ItemId>() {
@Override
public int compare(ItemId lhs, ItemId rhs) {
return Long.valueOf(lhs.getTimestamp()).compareTo(rhs.getTimestamp());
}
});

for (int i = 0; i < itemIds.size(); i += 50) {
if (i + 50 <= itemIds.size()) {
dataMgr.markItemsAsReadItemIds(itemIds, i, i + 50);
Expand Down
5 changes: 2 additions & 3 deletions src/org/freshrss/easyrss/network/url/StreamContentsURL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

package org.freshrss.easyrss.network.url;

import android.net.Uri;

/*
* Reference: http://code.google.com/p/google-reader-api/wiki/ApiStreamContents
*/
Expand All @@ -34,7 +32,7 @@ public StreamContentsURL(final boolean isHttpsConnection, final String uid, fina

@Override
public String getBaseURL() {
return appendURL(serverUrl + URL_STREAM_CONTENTS, Uri.encode(uid, "/"));
return appendURL(serverUrl, URL_STREAM_CONTENTS);
}

public String getContinuation() {
Expand Down Expand Up @@ -96,6 +94,7 @@ public void setNewestItemTime(final long newestItemTime) {

public void setUid(final String uid) {
this.uid = uid;
addParam("s", uid);
}

public void setUnread(final boolean isUnread) {
Expand Down