aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorCamil Staps2015-06-15 20:06:16 +0200
committerCamil Staps2015-06-15 20:06:16 +0200
commit47f61f958ea9fc8d1b690035584f5ebad2d6e19e (patch)
tree432925cebef56ddc2b33e48ba760ad81e6795a7c /app/src/main/java
parentFinishing localization ru,nl,fr (diff)
Hotfix NullPointerException on open in...
Diffstat (limited to 'app/src/main/java')
-rwxr-xr-xapp/src/main/java/org/rssin/android/FeedsActivity.java6
-rwxr-xr-xapp/src/main/java/org/rssin/android/FeedsList.java2
-rwxr-xr-xapp/src/main/java/org/rssin/android/FilterSettingsActivity.java3
-rwxr-xr-xapp/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java2
-rwxr-xr-xapp/src/main/java/org/rssin/rssin/Feed.java8
5 files changed, 9 insertions, 12 deletions
diff --git a/app/src/main/java/org/rssin/android/FeedsActivity.java b/app/src/main/java/org/rssin/android/FeedsActivity.java
index 1ac091e..ec5d5c7 100755
--- a/app/src/main/java/org/rssin/android/FeedsActivity.java
+++ b/app/src/main/java/org/rssin/android/FeedsActivity.java
@@ -61,6 +61,8 @@ public class FeedsActivity extends ActionBarActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.fragment_feeds);
+ feedsView = (ListView) findViewById(R.id.feeds_list);
+
Intent intent = getIntent();
String ac = intent.getAction();
if (ac != null && ac.equals(Intent.ACTION_VIEW)) {
@@ -69,8 +71,6 @@ public class FeedsActivity extends ActionBarActivity {
openAddDialog();
}
- feedsView = (ListView) findViewById(R.id.feeds_list);
-
try {
feedsList = FeedsList.getInstance(this);
} catch (IOException e) {
@@ -141,7 +141,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, DefaultStorageProvider.getInstance(context), VolleyFetcher.getInstance(context), new FallibleListener<String, Object>() {
+ Feed f = new Feed(value, DefaultStorageProvider.getInstance(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 96f07f4..d3838bf 100755
--- a/app/src/main/java/org/rssin/android/FeedsList.java
+++ b/app/src/main/java/org/rssin/android/FeedsList.java
@@ -59,7 +59,7 @@ class FeedsList {
String[] feedsList = context.getResources().getStringArray(R.array.default_feeds);
for (String url : feedsList) {
try {
- Feed f = new Feed(url, context, DefaultStorageProvider.getInstance(context), VolleyFetcher.getInstance(context), null);
+ Feed f = new Feed(url, DefaultStorageProvider.getInstance(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 ae0327a..2ea0ecf 100755
--- a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
+++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
@@ -129,10 +129,9 @@ public class FilterSettingsActivity extends ActionBarActivity {
String value = editText.getText().toString();
try {
URL url = new URL(value);
- Feed feed = new Feed(url, context, DefaultStorageProvider.getInstance(context), VolleyFetcher.getInstance(context), new FallibleListener<String, Object>() {
+ Feed feed = new Feed(url, DefaultStorageProvider.getInstance(context), VolleyFetcher.getInstance(context), new FallibleListener<String, Object>() {
@Override
public void onError(Object error) {
-
}
@Override
diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
index 7f6163a..5c73158 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
@@ -140,7 +140,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, DefaultStorageProvider.getInstance(context), VolleyFetcher.getInstance(context), new FallibleListener<String, Object>() {
+ Feed f = new Feed(value, DefaultStorageProvider.getInstance(context), VolleyFetcher.getInstance(context), new FallibleListener<String, Object>() {
@Override
public void onError(Object error) {
diff --git a/app/src/main/java/org/rssin/rssin/Feed.java b/app/src/main/java/org/rssin/rssin/Feed.java
index a89b9da..bb97eaf 100755
--- a/app/src/main/java/org/rssin/rssin/Feed.java
+++ b/app/src/main/java/org/rssin/rssin/Feed.java
@@ -60,12 +60,11 @@ public class Feed implements Storable, Comparable<Feed>, Jsonable {
/**
* Creates a new Feed.
* @param url The url of the feed.
- * @param context The context.
* @param storage The FeedStorageProvider that can be used to save the Feed after loading the title.
* @param fetcher The fetcher that can be used to load the feed and obtain the feed title.
* @param titleHasChanged A listener that will be invoked when the title of the feed has been retrieved.
*/
- public Feed(URL url, Context context, FeedStorageProvider storage, Fetcher fetcher, FallibleListener<String, Object> titleHasChanged) {
+ public Feed(URL url, FeedStorageProvider storage, Fetcher fetcher, FallibleListener<String, Object> titleHasChanged) {
this.url = url;
setTitleFromURL(storage, fetcher, titleHasChanged);
}
@@ -73,13 +72,12 @@ public class Feed implements Storable, Comparable<Feed>, Jsonable {
/**
* Creates a new Feed.
* @param url The url of the feed.
- * @param context The context.
* @param storage The FeedStorageProvider that can be used to save the Feed after loading the title.
* @param fetcher The fetcher that can be used to load the feed and obtain the feed title.
* @param titleHasChanged A listener that will be invoked when the title of the feed has been retrieved.
*/
- public Feed(String url, Context context, FeedStorageProvider storage, Fetcher fetcher, FallibleListener<String, Object> titleHasChanged) throws MalformedURLException {
- this(new URL(url), context, storage, fetcher, titleHasChanged);
+ public Feed(String url, FeedStorageProvider storage, Fetcher fetcher, FallibleListener<String, Object> titleHasChanged) throws MalformedURLException {
+ this(new URL(url), storage, fetcher, titleHasChanged);
}
public Feed(URL url, String title) {