Added icons, changed filter title edittext to singleline, fixed feed settings crash

3 files changed, 5 insertions, 3 deletions

diff --git a/app/src/main/java/org/rssin/android/FeedsActivity.java b/app/src/main/java/org/rssin/android/FeedsActivity.java
index 32f256a..87edab0 100755
--- a/app/src/main/java/org/rssin/android/FeedsActivity.java
+++ b/app/src/main/java/org/rssin/android/FeedsActivity.java
@@ -45,7 +45,7 @@ public class FeedsActivity extends ActionBarActivity {
 
         Intent intent = getIntent();
         String ac = intent.getAction();
-        if (ac.equals(Intent.ACTION_VIEW)) {
+        if (ac != null && ac.equals(Intent.ACTION_VIEW)) {
             //open with
             startUri = intent.getData().toString();
             openAddDialog();
diff --git a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
index 3041859..a38c7bc 100755
--- a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
+++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
@@ -187,6 +187,7 @@ public class FilterSettingsActivity extends ActionBarActivity {
 
         final EditText input = new EditText(this);
         input.setText(filter.getTitle());
+        input.setSingleLine(true);
         input.setFocusable(true);
         input.requestFocus();
 
diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java b/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java
index 2a24342..8f0a068 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java
@@ -57,12 +57,13 @@ class NavigationDrawerAdapter implements ListAdapter {
 

     @Override

     public boolean areAllItemsEnabled() {

-        return true;

+        return false;

     }

 

     @Override

     public boolean isEnabled(int position) {

-        return true;

+        // Position 0 is always "Start"

+        return position != 0;

     }

 

     private List<DataSetObserver> observers = new ArrayList<>();