nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-23 12:51:16 +00:00
Code Releases Activity

Merge branch 'Zillode-support-unknown-state'

Browse source
This commit is contained in:
Felix Ableitner 2015-03-24 00:40:44 +01:00
commit 07027af420
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
View file

@ -686,6 +686,8 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
case "scanning": return c.getString(R.string.state_scanning); case "scanning": return c.getString(R.string.state_scanning);
case "cleaning": return c.getString(R.string.state_cleaning); case "cleaning": return c.getString(R.string.state_cleaning);
case "syncing": return c.getString(R.string.state_syncing); case "syncing": return c.getString(R.string.state_syncing);
case "unknown": // Fallthrough
case "": return c.getString(R.string.state_unknown);
} }
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
throw new AssertionError("Unexpected folder state"); throw new AssertionError("Unexpected folder state");

1
src/main/res/values/strings.xml
View file

@ -370,5 +370,6 @@ Please report any problems you encounter via Github.</string>
<string name="state_scanning">Scanning</string> <string name="state_scanning">Scanning</string>
<string name="state_cleaning">Cleaning</string> <string name="state_cleaning">Cleaning</string>
<string name="state_syncing">Syncing</string> <string name="state_syncing">Syncing</string>
<string name="state_unknown">Unknown</string>
</resources> </resources>