Several fixes

10 files changed, 51 insertions, 55 deletions

diff --git a/app/src/main/java/org/rssin/android/FeedItemsListFragment.java b/app/src/main/java/org/rssin/android/FeedItemsListFragment.java
index d287884..f229098 100644
--- a/app/src/main/java/org/rssin/android/FeedItemsListFragment.java
+++ b/app/src/main/java/org/rssin/android/FeedItemsListFragment.java
@@ -94,27 +94,32 @@ public class FeedItemsListFragment extends Fragment {
         loadingView.setVisibility(View.VISIBLE);
 
         FeedLoaderAndSorter loaderAndSorter = new FeedLoaderAndSorter(feeds);
-        loaderAndSorter.getFilteredFeedItems(
-                DefaultStorageProvider.getInstance(context),
-                VolleyFetcher.getInstance(context),
-                new RealtimeListener<List<SortedFeedItemContainer>, Object>() {
-                    @Override
-                    public void finish() {
-                        loadingView.setVisibility(View.GONE);
-                    }
-
-                    @Override
-                    public void onReceive(List<SortedFeedItemContainer> data) {
-                        feedItemAdapter.feedItems = data;
-                        feedItemAdapter.notifyDataSetChanged();
-                    }
 
-                    @Override
-                    public void onError(Object error) {
-                        Frontend.error(context, R.string.error_net_load);
+        try {
+            loaderAndSorter.getFilteredFeedItems(
+                    DefaultStorageProvider.getInstance(context),
+                    VolleyFetcher.getInstance(context),
+                    new RealtimeListener<List<SortedFeedItemContainer>, Object>() {
+                        @Override
+                        public void finish() {
+                            loadingView.setVisibility(View.GONE);
+                        }
+
+                        @Override
+                        public void onReceive(List<SortedFeedItemContainer> data) {
+                            feedItemAdapter.feedItems = data;
+                            feedItemAdapter.notifyDataSetChanged();
+                        }
+
+                        @Override
+                        public void onError(Object error) {
+                            Frontend.error(context, R.string.error_net_load);
+                        }
                     }
-                }
-        );
+            );
+        } catch (Exception e) {
+            Frontend.error(context, R.string.error_unknown);
+        }
     }
 
 }
diff --git a/app/src/main/java/org/rssin/neurons/NeuralNetwork.java b/app/src/main/java/org/rssin/neurons/NeuralNetwork.java
index bd00dad..6164e06 100644
--- a/app/src/main/java/org/rssin/neurons/NeuralNetwork.java
+++ b/app/src/main/java/org/rssin/neurons/NeuralNetwork.java
@@ -1,21 +1,21 @@
-/**
- * RSSin - Clever RSS reader for Android
- * Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation; either version 2 of the License, or 
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+/**

+ * RSSin - Clever RSS reader for Android

+ * Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by 

+ * the Free Software Foundation; either version 2 of the License, or 

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License along

+ * with this program; if not, write to the Free Software Foundation, Inc.,

+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+ */

 package org.rssin.neurons;

 

 import android.annotation.SuppressLint;

@@ -77,7 +77,7 @@ class NeuralNetwork implements Serializable {
             Neuron n = hiddenNodes[neuronNum];

 

             double neuronOutput = 0;

-            for (int i = 0; i < n.getWeightCount(); i++) {

+            for (int i = 0; i < n.getWeightCount() && i < inputs.length; i++) {

                 neuronOutput += n.getWeight(i) * inputs[i];

             }

 

@@ -130,10 +130,10 @@ class NeuralNetwork implements Serializable {
         final double learningRate = 0.2;

 

         //Update input => hidden weights.

-        for (int neuronNum = 0; neuronNum < hiddenNodes.length; neuronNum++) {

+        for (int neuronNum = 0; neuronNum < hiddenNodes.length && neuronNum < hiddenGradients.length; neuronNum++) {

             Neuron n = hiddenNodes[neuronNum];

 

-            for (int i = 0; i < n.getWeightCount(); i++) {

+            for (int i = 0; i < n.getWeightCount() && i < inputs.length; i++) {

                 //Calulate & apply delta

                 double delta = learningRate * hiddenGradients[neuronNum] * inputs[i];

                 n.adjustWeight(i, delta);

diff --git a/app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java b/app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java
index e561657..bd73538 100644
--- a/app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java
+++ b/app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java
@@ -117,13 +117,11 @@ public class FeedLoaderAndSorter {
                     synchronized (counter) {

                         counter.decr();

                         Log.v("FLAS", "Counter has size " + counter.count);

+                        Log.v("FLAS", "Calling onReceive");

+                        listener.onReceive(resultingItems);

                         if (counter.isZero()) {

-                            Log.v("FLAS", "Calling onReceive");

-                            listener.onReceive(resultingItems);

-                            if (counter.isZero()) {

-                                Log.v("FLAS", "Calling finish");

-                                ((RealtimeListener) listener).finish();

-                            }

+                            Log.v("FLAS", "Calling finish");

+                            ((RealtimeListener) listener).finish();

                         }

                     }

                 }

diff --git a/app/src/main/res/drawable-hdpi/ic_action_action_info_outline.png b/app/src/main/res/drawable-hdpi/ic_action_action_info_outline.png
new file mode 100644
index 0000000..b950b47
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_action_info_outline.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_action_info_outline.png b/app/src/main/res/drawable-mdpi/ic_action_action_info_outline.png
new file mode 100644
index 0000000..aeef0f5
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_action_info_outline.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_action_info_outline.png b/app/src/main/res/drawable-xhdpi/ic_action_action_info_outline.png
new file mode 100644
index 0000000..3b065cd
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_action_info_outline.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_action_info_outline.png b/app/src/main/res/drawable-xxhdpi/ic_action_action_info_outline.png
new file mode 100644
index 0000000..925f5c5
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_action_info_outline.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_action_info_outline.png b/app/src/main/res/drawable-xxxhdpi/ic_action_action_info_outline.png
new file mode 100644
index 0000000..415b401
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_action_action_info_outline.png
diff --git a/app/src/main/res/layout/activity_article.xml b/app/src/main/res/layout/activity_article.xml
index 374a95d..a96a680 100644
--- a/app/src/main/res/layout/activity_article.xml
+++ b/app/src/main/res/layout/activity_article.xml
@@ -53,6 +53,7 @@
                 android:id="@+id/article_description"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:linksClickable="true"
                 android:textSize="@dimen/font_size_normal" />
 
             <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b979926..b2194e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,18 +59,14 @@
     <string name="error_save_filters">Couldn\'t save filter</string>
     <string name="error_load_filters">Couldn\'t load filters</string>
     <string name="error_delete_filter">Couldn\'t delete filter</string>
-
     <string name="error_save_feeds">Couldn\'t save feeds</string>
     <string name="error_load_feeds">Couldn\'t load feeds</string>
     <string name="error_delete_feed">Couldn\'t delete feed</string>
-
     <string name="error_invalid_url">Invalid URL</string>
-
     <string name="error_net_load">Internet problem</string>
-
     <string name="error_save_feedsorter">Couldn\'t store personal preferences</string>
-
     <string name="error_load_article">Couldn\'t load article</string>
+    <string name="error_unknown">An unknown error occured</string>
 
     <string name="feeds">feeds</string>
 
@@ -78,10 +74,6 @@
     <string name="article_action_like">Like</string>
     <string name="title_activity_home_screen">RSSin</string>
 
-    <string name="title_section1">Section 1</string>
-    <string name="title_section2">Section 2</string>
-    <string name="title_section3">Section 3</string>
-
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>