aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorHalzyn2015-06-10 13:38:17 +0200
committerHalzyn2015-06-10 13:38:17 +0200
commit8cd232ca0ea6a6fc5c5557a031d172d60175c1de (patch)
treed29c976f1db465f47ff2eb5cefa4cdfca1fd6c76 /app
parentMerge (diff)
parentFix everything (diff)
Merge branch 'master' of https://github.com/camilstaps/RSSin
Diffstat (limited to 'app')
-rwxr-xr-xapp/src/main/java/org/rssin/android/FeedsActivity.java2
-rwxr-xr-x[-rw-r--r--]app/src/main/java/org/rssin/android/FeedsList.java2
-rwxr-xr-xapp/src/main/java/org/rssin/android/FilterSettingsActivity.java2
-rwxr-xr-xapp/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/java/org/rssin/android/FeedsActivity.java b/app/src/main/java/org/rssin/android/FeedsActivity.java
index 37e8434..f28b363 100755
--- a/app/src/main/java/org/rssin/android/FeedsActivity.java
+++ b/app/src/main/java/org/rssin/android/FeedsActivity.java
@@ -124,7 +124,7 @@ public class FeedsActivity extends ActionBarActivity {
public void onClick(DialogInterface dialog, int whichButton) {
String value = input.getText().toString();
try {
- Feed f = new Feed(value, context, new VolleyFetcher(context), new FallibleListener<String, Object>() {
+ Feed f = new Feed(value, context, VolleyFetcher.getInstance(context), new FallibleListener<String, Object>() {
@Override
public void onError(Object error) {
diff --git a/app/src/main/java/org/rssin/android/FeedsList.java b/app/src/main/java/org/rssin/android/FeedsList.java
index 1036ad3..f49707b 100644..100755
--- a/app/src/main/java/org/rssin/android/FeedsList.java
+++ b/app/src/main/java/org/rssin/android/FeedsList.java
@@ -41,7 +41,7 @@ class FeedsList {
String[] feedsList = context.getResources().getStringArray(R.array.default_feeds);
for (String url : feedsList) {
try {
- Feed f = new Feed(url);
+ Feed f = new Feed(url, context, VolleyFetcher.getInstance(context), null);
f.store(storageProvider);
} catch (Exception e) {
Log.w("SPSP", "Couldn't add " + url, e);
diff --git a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
index 670c986..c5e6250 100755
--- a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
+++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
@@ -112,7 +112,7 @@ public class FilterSettingsActivity extends ActionBarActivity {
String value = editText.getText().toString();
try {
URL url = new URL(value);
- Feed feed = new Feed(url, context, new VolleyFetcher(context), new FallibleListener<String, Object>() {
+ Feed feed = new Feed(url, context, VolleyFetcher.getInstance(context), new FallibleListener<String, Object>() {
@Override
public void onError(Object error) {
diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
index bc2b710..dc2cfd6 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
@@ -134,7 +134,7 @@ public class NavigationDrawerManageFeedsFragment extends Fragment {
public void onClick(DialogInterface dialog, int whichButton) {
String value = input.getText().toString();
try {
- Feed f = new Feed(value, context, new VolleyFetcher(context), new FallibleListener<String, Object>() {
+ Feed f = new Feed(value, context, VolleyFetcher.getInstance(context), new FallibleListener<String, Object>() {
@Override
public void onError(Object error) {