From 2ed6dac071fbb5757653054724906370e557edfc Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Fri, 22 May 2015 22:33:14 +0200
Subject: [PATCH] Display toast if folder observer fails (fixes #326).

---
 .../syncthingandroid/syncthing/SyncthingService.java       | 7 +++++++
 src/main/res/values/strings.xml                            | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java b/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
index e0c4078d..395f914d 100644
--- a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
+++ b/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
@@ -19,6 +19,7 @@ import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.util.Pair;
+import android.widget.Toast;
 
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.activities.MainActivity;
@@ -325,6 +326,12 @@ public class SyncthingService extends Service implements
                                     mObservers.add(new FolderObserver(mApi, r));
                                 } catch (FolderObserver.FolderNotExistingException e) {
                                     Log.w(TAG, "Failed to add observer for folder", e);
+                                } catch (StackOverflowError e) {
+                                    Log.w(TAG, "Failed to add folder observer", e);
+                                    Toast.makeText(SyncthingService.this,
+                                            R.string.toast_folder_observer_stack_overflow,
+                                            Toast.LENGTH_LONG)
+                                            .show();
                                 }
                             }
                         }
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 49ffb70b..8c0ef6a2 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -393,6 +393,9 @@ Please report any problems you encounter via Github.</string>
     <!-- Title of the notification shown while syncthing is running and enabled -->
     <string name="syncthing_active">Syncthing is running</string>
 
+    <!-- Toast shown if folder observer fails to traverse a folder -->
+    <string name="toast_folder_observer_stack_overflow">Directory tree too deep. Check for cyclic symlinks</string>
+
     <!-- RestApi -->