Merge branch 'master' into krypton

addon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.xbmcbackup"
-    name="Backup" version="1.1.2" provider-name="robweber">
+    name="Backup" version="1.1.3" provider-name="robweber">
   <requires>
 	<!-- jarvis -->
     <import addon="xbmc.python" version="2.25.0"/>

changelog.txt

@@ -1,3 +1,8 @@
+Version 1.1.3
+
+added file chunk support for dropbox uploads
+fixed settings duplicate ids, thanks aster-anto
+
 Version 1.1.2
 
 added fixes to the Dropbox lib for python 2.6

resources/language/resource.language.en_us/strings.po

@@ -129,14 +129,6 @@ msgctxt "#30035"
 msgid "Config Files"
 msgstr "Config Files"
 
-msgctxt "#30036"
-msgid "Custom Directory 1"
-msgstr "Custom Directory 1"
-
-msgctxt "#30037"
-msgid "Custom Directory 2"
-msgstr "Custom Directory 2"
-
 msgctxt "#30038"
 msgid "Advanced Settings Detected"
 msgstr "Advanced Settings Detected"

resources/lib/backup.py

@@ -472,6 +472,14 @@ class XbmcBackup:
         
         #remove the validation file
         xbmcvfs.delete(xbmc.translatePath(utils.data_dir() + "xbmcbackup.val"))
+
+        if(success):
+            #android requires a .nomedia file to not index the directory as media
+            if(not xbmcvfs.exists(xbmc.translatePath(utils.data_dir() + ".nomedia"))):
+                nmFile = xbmcvfs.File(xbmc.translatePath(utils.data_dir() + ".nomedia"),'w')
+                nmFile.close()
+
+            success = self.remote_vfs.put(xbmc.translatePath(utils.data_dir() + ".nomedia"),self.remote_vfs.root_path + ".nomedia")
         
         return success