diff --git a/.drone.yml b/.drone.yml index 4cb0358c1f..6879b0097e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,7 +34,7 @@ pipeline: # needs gplay - sed -i '/com.google.*.gms/s/^.*\/\///g' build.gradle - export BRANCH=$(scripts/lint/getBranchName.sh ${GIT_USERNAME} ${GIT_TOKEN} ${DRONE_PULL_REQUEST}) - - ruby scripts/lint/lint-up.rb ${GIT_USERNAME} ${GIT_TOKEN} $BRANCH + - scripts/lint/lint-up-wrapper.sh ${GIT_USERNAME} ${GIT_TOKEN} $BRANCH ${LOG_USERNAME} ${LOG_PASSWORD} ${DRONE_BUILD_NUMBER} when: matrix: FLAVOUR: Modified diff --git a/.drone.yml.sig b/.drone.yml.sig index 07e4da62e0..50bf8ccf99 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgdGVzdDoKICAgIGltYWdlOiBuZXh0Y2xvdWRjaS9hbmRyb2lkOmFuZHJvaWQtMTgKICAgIGNvbW1hbmRzOgogICAgICAjIHVuY29tbWVudCBncGxheSBmb3IgR3BsYXksIE1vZGlmaWVkIG9ubHkKICAgICAgLSBzaCAtYyAiaWYgWyAnJEZMQVZPVVInICE9ICdHZW5lcmljJyBdOyB0aGVuIHNlZCAtaSAnL2NvbS5nb29nbGUuKi5nbXMvcy9eLipcL1wvLy9nJyBidWlsZC5ncmFkbGU7IGZpIgoKICAgICAgLSBlY2hvIG5vIHwgYW5kcm9pZCBjcmVhdGUgYXZkIC0tZm9yY2UgLW4gdGVzdCAtdCAkQU5EUk9JRF9UQVJHRVQgLS1hYmkgJEFORFJPSURfQUJJIC1jIDIwTQogICAgICAtIGVtdWxhdG9yIC1hdmQgdGVzdCAtbm8td2luZG93ICYKICAgICAgLSAuL3dhaXRfZm9yX2VtdWxhdG9yLnNoCgogICAgICAjIGJ1aWxkIGFwcCBhbmQgYXNzZW1ibGUgQVBLLCBpbiBkZWJ1ZyBtb2RlCiAgICAgIC0gLi9ncmFkbGV3IGFzc2VtYmxlJHtGTEFWT1VSfQoKICAgICAgIyBydW4gYWxsIHRoZSBpbnN0cnVtZW50ZWQgdGVzdHMgb2YgYXBwIG1vZHVsZSAtIERJU0FCTEVEIHVudGlsIHdlIGdldCBhbiBzdGFibGUgc2V0dXAgZm9yIEVzcHJlc3NvIGluIFRyYXZpcwogICAgICAjIC0gLi9ncmFkbGV3IGNvbm5lY3RlZERlYnVnQW5kcm9pZFRlc3QgLS1pbmZvCgogICAgICAjIGluc3RhbGwgYXBwLCB0aGVuIGFzc2VtYmxlIGFuZCBpbnN0YWxsIGluc3RydW1lbnRlZCB0ZXN0cyBvZiBhcHAgbW9kdWxlCiAgICAgIC0gLi9ncmFkbGV3IDppbnN0YWxsJHtGTEFWT1VSfURlYnVnCiAgICAgIC0gLi9ncmFkbGV3IDppbnN0YWxsJHtGTEFWT1VSfURlYnVnQW5kcm9pZFRlc3QKCiAgICAgICMgcnVuIHNhbXBsZSBpbnN0cnVtZW50ZWQgdW5pdCB0ZXN0CiAgICAgICMgVE9ETyBmYWlscyBiZWNhdXNlIHRlc3QgcnVubmVyIGlzIG5vdCBhdmFpbGFibGUKICAgICAgIy0gYWRiIHNoZWxsIGFtIGluc3RydW1lbnQgLXcgLWUgZGVidWcgZmFsc2UgLWUgY2xhc3MgY29tLm93bmNsb3VkLmFuZHJvaWQuZGF0YW1vZGVsLk9DRmlsZVVuaXRUZXN0IGNvbS5vd25jbG91ZC5hbmRyb2lkLnRlc3QvYW5kcm9pZC5zdXBwb3J0LnRlc3QucnVubmVyLkFuZHJvaWRKVW5pdFJ1bm5lcgoKICAgIGVudmlyb25tZW50OgogICAgICAtIEFORFJPSURfVEFSR0VUPWFuZHJvaWQtMjQKICAgICAgLSBBTkRST0lEX0FCST1hcm1lYWJpLXY3YQogICAgICAtIExEX0xJQlJBUllfUEFUSD0vdXNyL2xpYi94ODZfNjQtbGludXgtZ251Lzovb3B0L2FuZHJvaWQtc2RrLWxpbnV4L3Rvb2xzL2xpYjY0L2dsZXNfbWVzYS8KCiAgbGludDoKICAgICAgaW1hZ2U6IG5leHRjbG91ZGNpL2FuZHJvaWQ6YW5kcm9pZC0xOAogICAgICBjb21tYW5kczoKICAgICAgICAjIG5lZWRzIGdwbGF5CiAgICAgICAgLSBzZWQgLWkgJy9jb20uZ29vZ2xlLiouZ21zL3MvXi4qXC9cLy8vZycgYnVpbGQuZ3JhZGxlCiAgICAgICAgLSBleHBvcnQgQlJBTkNIPSQoc2NyaXB0cy9saW50L2dldEJyYW5jaE5hbWUuc2ggJHtHSVRfVVNFUk5BTUV9ICR7R0lUX1RPS0VOfSAke0RST05FX1BVTExfUkVRVUVTVH0pCiAgICAgICAgLSBydWJ5IHNjcmlwdHMvbGludC9saW50LXVwLnJiICR7R0lUX1VTRVJOQU1FfSAke0dJVF9UT0tFTn0gJEJSQU5DSAogICAgICB3aGVuOgogICAgICAgIG1hdHJpeDoKICAgICAgICAgIEZMQVZPVVI6IE1vZGlmaWVkCgptYXRyaXg6CiAgRkxBVk9VUjoKICAgIC0gR2VuZXJpYwogICAgLSBHcGxheQogICAgLSBNb2RpZmllZAoKYnJhbmNoZXM6IG1hc3Rlcg.BJDcPdoKinGxnz6zT8dBxvwE_DBi9QyzXXnk0LOOdV4 \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgdGVzdDoKICAgIGltYWdlOiBuZXh0Y2xvdWRjaS9hbmRyb2lkOmFuZHJvaWQtMTgKICAgIGNvbW1hbmRzOgogICAgICAjIHVuY29tbWVudCBncGxheSBmb3IgR3BsYXksIE1vZGlmaWVkIG9ubHkKICAgICAgLSBzaCAtYyAiaWYgWyAnJEZMQVZPVVInICE9ICdHZW5lcmljJyBdOyB0aGVuIHNlZCAtaSAnL2NvbS5nb29nbGUuKi5nbXMvcy9eLipcL1wvLy9nJyBidWlsZC5ncmFkbGU7IGZpIgoKICAgICAgLSBlY2hvIG5vIHwgYW5kcm9pZCBjcmVhdGUgYXZkIC0tZm9yY2UgLW4gdGVzdCAtdCAkQU5EUk9JRF9UQVJHRVQgLS1hYmkgJEFORFJPSURfQUJJIC1jIDIwTQogICAgICAtIGVtdWxhdG9yIC1hdmQgdGVzdCAtbm8td2luZG93ICYKICAgICAgLSAuL3dhaXRfZm9yX2VtdWxhdG9yLnNoCgogICAgICAjIGJ1aWxkIGFwcCBhbmQgYXNzZW1ibGUgQVBLLCBpbiBkZWJ1ZyBtb2RlCiAgICAgIC0gLi9ncmFkbGV3IGFzc2VtYmxlJHtGTEFWT1VSfQoKICAgICAgIyBydW4gYWxsIHRoZSBpbnN0cnVtZW50ZWQgdGVzdHMgb2YgYXBwIG1vZHVsZSAtIERJU0FCTEVEIHVudGlsIHdlIGdldCBhbiBzdGFibGUgc2V0dXAgZm9yIEVzcHJlc3NvIGluIFRyYXZpcwogICAgICAjIC0gLi9ncmFkbGV3IGNvbm5lY3RlZERlYnVnQW5kcm9pZFRlc3QgLS1pbmZvCgogICAgICAjIGluc3RhbGwgYXBwLCB0aGVuIGFzc2VtYmxlIGFuZCBpbnN0YWxsIGluc3RydW1lbnRlZCB0ZXN0cyBvZiBhcHAgbW9kdWxlCiAgICAgIC0gLi9ncmFkbGV3IDppbnN0YWxsJHtGTEFWT1VSfURlYnVnCiAgICAgIC0gLi9ncmFkbGV3IDppbnN0YWxsJHtGTEFWT1VSfURlYnVnQW5kcm9pZFRlc3QKCiAgICAgICMgcnVuIHNhbXBsZSBpbnN0cnVtZW50ZWQgdW5pdCB0ZXN0CiAgICAgICMgVE9ETyBmYWlscyBiZWNhdXNlIHRlc3QgcnVubmVyIGlzIG5vdCBhdmFpbGFibGUKICAgICAgIy0gYWRiIHNoZWxsIGFtIGluc3RydW1lbnQgLXcgLWUgZGVidWcgZmFsc2UgLWUgY2xhc3MgY29tLm93bmNsb3VkLmFuZHJvaWQuZGF0YW1vZGVsLk9DRmlsZVVuaXRUZXN0IGNvbS5vd25jbG91ZC5hbmRyb2lkLnRlc3QvYW5kcm9pZC5zdXBwb3J0LnRlc3QucnVubmVyLkFuZHJvaWRKVW5pdFJ1bm5lcgoKICAgIGVudmlyb25tZW50OgogICAgICAtIEFORFJPSURfVEFSR0VUPWFuZHJvaWQtMjQKICAgICAgLSBBTkRST0lEX0FCST1hcm1lYWJpLXY3YQogICAgICAtIExEX0xJQlJBUllfUEFUSD0vdXNyL2xpYi94ODZfNjQtbGludXgtZ251Lzovb3B0L2FuZHJvaWQtc2RrLWxpbnV4L3Rvb2xzL2xpYjY0L2dsZXNfbWVzYS8KCiAgbGludDoKICAgICAgaW1hZ2U6IG5leHRjbG91ZGNpL2FuZHJvaWQ6YW5kcm9pZC0xOAogICAgICBjb21tYW5kczoKICAgICAgICAjIG5lZWRzIGdwbGF5CiAgICAgICAgLSBzZWQgLWkgJy9jb20uZ29vZ2xlLiouZ21zL3MvXi4qXC9cLy8vZycgYnVpbGQuZ3JhZGxlCiAgICAgICAgLSBleHBvcnQgQlJBTkNIPSQoc2NyaXB0cy9saW50L2dldEJyYW5jaE5hbWUuc2ggJHtHSVRfVVNFUk5BTUV9ICR7R0lUX1RPS0VOfSAke0RST05FX1BVTExfUkVRVUVTVH0pCiAgICAgICAgLSBzY3JpcHRzL2xpbnQvbGludC11cC13cmFwcGVyLnNoICR7R0lUX1VTRVJOQU1FfSAke0dJVF9UT0tFTn0gJEJSQU5DSCAke0xPR19VU0VSTkFNRX0gJHtMT0dfUEFTU1dPUkR9ICR7RFJPTkVfQlVJTERfTlVNQkVSfQogICAgICB3aGVuOgogICAgICAgIG1hdHJpeDoKICAgICAgICAgIEZMQVZPVVI6IE1vZGlmaWVkCgptYXRyaXg6CiAgRkxBVk9VUjoKICAgIC0gR2VuZXJpYwogICAgLSBHcGxheQogICAgLSBNb2RpZmllZAoKYnJhbmNoZXM6IG1hc3Rlcg.vRQiBogC3hjPLCVvLM0-Qrbvk4hnwKscwaPRBlyc8NM \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ab0ba9a492..7ca0301f49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.4.3 (May 22, 2017) +- Hotfix: ignore oauth header for now and use basic auth to allow new logins for nc12 + ## 1.4.2 (March 14, 2017) - Auto Upload for newly taken photos/images (Android 6+) - Auto Upload improvements and fixes diff --git a/build.gradle b/build.gradle index 6a4b6d1bd4..2eb4756f47 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,6 @@ repositories { android { lintOptions { abortOnError false - lintConfig file("${project.rootDir}/lint.xml") htmlReport true htmlOutput file("$project.buildDir/reports/lint/lint.html") disable 'MissingTranslation' diff --git a/drawable_resources/ic_list_empty_image.svg b/drawable_resources/ic_list_empty_image.svg index bbaa5b6e3f..d885015618 100644 --- a/drawable_resources/ic_list_empty_image.svg +++ b/drawable_resources/ic_list_empty_image.svg @@ -1,21 +1,20 @@ + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="16" + width="16" + version="1" + id="svg4" + sodipodi:docname="ic_list_empty_image.svg" + inkscape:version="0.91 r13725" + inkscape:export-filename="C:\DEV\src\Android\Nextcloud\favourites\src\main\res\drawable-mdpi\ic_list_empty_image.png" + inkscape:export-xdpi="432" + inkscape:export-ydpi="432"> @@ -38,19 +37,19 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1005" + inkscape:window-width="1600" + inkscape:window-height="835" id="namedview6" showgrid="false" inkscape:zoom="14.75" - inkscape:cx="8" + inkscape:cx="17.694915" inkscape:cy="8" - inkscape:window-x="-9" - inkscape:window-y="-9" + inkscape:window-x="1600" + inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="16" + width="16" + version="1" + id="svg4" + sodipodi:docname="ic_list_empty_video.svg" + inkscape:version="0.91 r13725" + inkscape:export-filename="C:\DEV\src\Android\Nextcloud\favourites\src\main\res\drawable-mdpi\ic_list_empty_video.png" + inkscape:export-xdpi="432" + inkscape:export-ydpi="432"> @@ -38,21 +37,21 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1005" + inkscape:window-width="1600" + inkscape:window-height="835" id="namedview6" showgrid="false" - inkscape:zoom="14.75" - inkscape:cx="8" - inkscape:cy="8" - inkscape:window-x="-9" - inkscape:window-y="-9" + inkscape:zoom="20.85965" + inkscape:cx="-15.290906" + inkscape:cy="9.1100694" + inkscape:window-x="1600" + inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + color="#000" /> diff --git a/scripts/lint/lint-results.txt b/scripts/lint/lint-results.txt index e819a37182..87f489a671 100644 --- a/scripts/lint/lint-results.txt +++ b/scripts/lint/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 75 errors and 852 warnings + Lint Report: 74 errors and 848 warnings \ No newline at end of file diff --git a/scripts/lint/lint-up-wrapper.sh b/scripts/lint/lint-up-wrapper.sh new file mode 100755 index 0000000000..16bba8ac7a --- /dev/null +++ b/scripts/lint/lint-up-wrapper.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +#1: GIT_USERNAME +#2: GIT_TOKEN +#3: BRANCH +#4: LOG_USERNAME +#5: LOG_PASSWORD +#6: DRONE_BUILD_NUMBER + +ruby scripts/lint/lint-up.rb $1 $2 $3 + +if [ $? -eq 0 ]; then + echo "New master at: https://nextcloud.kaminsky.me/index.php/s/tXwtChzyqMj6I8v" + curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/droneLogs/master.html --upload-file build/reports/lint/lint.html +else + echo "New results at https://nextcloud.kaminsky.me/index.php/s/tXwtChzyqMj6I8v ->" $6.html + curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/droneLogs/$6.html --upload-file build/reports/lint/lint.html +fi diff --git a/src/gplay/AndroidManifest.xml b/src/gplay/AndroidManifest.xml index b35a5b09fb..8e252d1de1 100644 --- a/src/gplay/AndroidManifest.xml +++ b/src/gplay/AndroidManifest.xml @@ -19,8 +19,8 @@ + android:versionCode="10040399" + android:versionName="1.4.3"> . --> + android:versionCode="10040399" + android:versionName="1.4.3"> operations = - new ArrayList(updatedFiles.size()); + ArrayList operations = new ArrayList<>(updatedFiles.size()); // prepare operations to insert or update files to save in the given folder for (OCFile file : updatedFiles) { - ContentValues cv = new ContentValues(); - cv.put(ProviderTableMeta.FILE_MODIFIED, file.getModificationTimestamp()); - cv.put( - ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA, - file.getModificationTimestampAtLastSyncForData() - ); - cv.put(ProviderTableMeta.FILE_CREATION, file.getCreationTimestamp()); - cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, file.getFileLength()); - cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, file.getMimetype()); - cv.put(ProviderTableMeta.FILE_NAME, file.getFileName()); - //cv.put(ProviderTableMeta.FILE_PARENT, file.getParentId()); - cv.put(ProviderTableMeta.FILE_PARENT, folder.getFileId()); - cv.put(ProviderTableMeta.FILE_PATH, file.getRemotePath()); - if (!file.isFolder()) { - cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getStoragePath()); - } - cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name); - cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE, file.getLastSyncDateForProperties()); - cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA, file.getLastSyncDateForData()); - cv.put(ProviderTableMeta.FILE_KEEP_IN_SYNC, file.isAvailableOffline() ? 1 : 0); - cv.put(ProviderTableMeta.FILE_ETAG, file.getEtag()); - cv.put(ProviderTableMeta.FILE_SHARED_VIA_LINK, file.isSharedViaLink() ? 1 : 0); - cv.put(ProviderTableMeta.FILE_SHARED_WITH_SHAREE, file.isSharedWithSharee() ? 1 : 0); - cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, file.getPublicLink()); - cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions()); - cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId()); - cv.put(ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.needsUpdateThumbnail()); - cv.put(ProviderTableMeta.FILE_IS_DOWNLOADING, file.isDownloading()); - cv.put(ProviderTableMeta.FILE_ETAG_IN_CONFLICT, file.getEtagInConflict()); - cv.put(ProviderTableMeta.FILE_FAVORITE, file.getIsFavorite()); + ContentValues cv = createContentValueForFile(file, folder); boolean existsByPath = fileExists(file.getRemotePath()); if (existsByPath || fileExists(file.getFileId())) { // updating an existing file - operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI). - withValues(cv). - withSelection(ProviderTableMeta._ID + "=?", - new String[]{String.valueOf(file.getFileId())}) + operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI) + .withValues(cv) + .withSelection(ProviderTableMeta._ID + "=?", new String[]{String.valueOf(file.getFileId())}) .build()); } else { @@ -332,17 +301,14 @@ public class FileDataStorageManager { } // prepare operations to remove files in the given folder - String where = ProviderTableMeta.FILE_ACCOUNT_OWNER + AND + - ProviderTableMeta.FILE_PATH + "=?"; + String where = ProviderTableMeta.FILE_ACCOUNT_OWNER + AND + ProviderTableMeta.FILE_PATH + "=?"; String [] whereArgs = null; for (OCFile file : filesToRemove) { if (file.getParentId() == folder.getFileId()) { whereArgs = new String[]{mAccount.name, file.getRemotePath()}; if (file.isFolder()) { operations.add(ContentProviderOperation.newDelete( - ContentUris.withAppendedId( - ProviderTableMeta.CONTENT_URI_DIR, file.getFileId() - ) + ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_DIR, file.getFileId()) ).withSelection(where, whereArgs).build()); File localFolder = new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, file)); @@ -351,8 +317,7 @@ public class FileDataStorageManager { } } else { operations.add(ContentProviderOperation.newDelete( - ContentUris.withAppendedId( - ProviderTableMeta.CONTENT_URI_FILE, file.getFileId() + ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, file.getFileId() ) ).withSelection(where, whereArgs).build()); @@ -366,29 +331,7 @@ public class FileDataStorageManager { } // update metadata of folder - ContentValues cv = new ContentValues(); - cv.put(ProviderTableMeta.FILE_MODIFIED, folder.getModificationTimestamp()); - cv.put( - ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA, - folder.getModificationTimestampAtLastSyncForData() - ); - cv.put(ProviderTableMeta.FILE_CREATION, folder.getCreationTimestamp()); - cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, 0); - cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, folder.getMimetype()); - cv.put(ProviderTableMeta.FILE_NAME, folder.getFileName()); - cv.put(ProviderTableMeta.FILE_PARENT, folder.getParentId()); - cv.put(ProviderTableMeta.FILE_PATH, folder.getRemotePath()); - cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name); - cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE, folder.getLastSyncDateForProperties()); - cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA, folder.getLastSyncDateForData()); - cv.put(ProviderTableMeta.FILE_KEEP_IN_SYNC, folder.isAvailableOffline() ? 1 : 0); - cv.put(ProviderTableMeta.FILE_ETAG, folder.getEtag()); - cv.put(ProviderTableMeta.FILE_SHARED_VIA_LINK, folder.isSharedViaLink() ? 1 : 0); - cv.put(ProviderTableMeta.FILE_SHARED_WITH_SHAREE, folder.isSharedWithSharee() ? 1 : 0); - cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, folder.getPublicLink()); - cv.put(ProviderTableMeta.FILE_PERMISSIONS, folder.getPermissions()); - cv.put(ProviderTableMeta.FILE_REMOTE_ID, folder.getRemoteId()); - cv.put(ProviderTableMeta.FILE_FAVORITE, folder.getIsFavorite()); + ContentValues cv = createContentValueForFile(folder); operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI). withValues(cv). @@ -431,7 +374,67 @@ public class FileDataStorageManager { } } } + } + private ContentValues createContentValueForFile(OCFile folder) { + ContentValues cv = new ContentValues(); + cv.put(ProviderTableMeta.FILE_MODIFIED, folder.getModificationTimestamp()); + cv.put( + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA, + folder.getModificationTimestampAtLastSyncForData() + ); + cv.put(ProviderTableMeta.FILE_CREATION, folder.getCreationTimestamp()); + cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, 0); + cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, folder.getMimetype()); + cv.put(ProviderTableMeta.FILE_NAME, folder.getFileName()); + cv.put(ProviderTableMeta.FILE_PARENT, folder.getParentId()); + cv.put(ProviderTableMeta.FILE_PATH, folder.getRemotePath()); + cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name); + cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE, folder.getLastSyncDateForProperties()); + cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA, folder.getLastSyncDateForData()); + cv.put(ProviderTableMeta.FILE_KEEP_IN_SYNC, folder.isAvailableOffline() ? 1 : 0); + cv.put(ProviderTableMeta.FILE_ETAG, folder.getEtag()); + cv.put(ProviderTableMeta.FILE_SHARED_VIA_LINK, folder.isSharedViaLink() ? 1 : 0); + cv.put(ProviderTableMeta.FILE_SHARED_WITH_SHAREE, folder.isSharedWithSharee() ? 1 : 0); + cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, folder.getPublicLink()); + cv.put(ProviderTableMeta.FILE_PERMISSIONS, folder.getPermissions()); + cv.put(ProviderTableMeta.FILE_REMOTE_ID, folder.getRemoteId()); + cv.put(ProviderTableMeta.FILE_FAVORITE, folder.getIsFavorite()); + return cv; + } + + private ContentValues createContentValueForFile(OCFile file, OCFile folder) { + ContentValues cv = new ContentValues(); + cv.put(ProviderTableMeta.FILE_MODIFIED, file.getModificationTimestamp()); + cv.put( + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA, + file.getModificationTimestampAtLastSyncForData() + ); + cv.put(ProviderTableMeta.FILE_CREATION, file.getCreationTimestamp()); + cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, file.getFileLength()); + cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, file.getMimetype()); + cv.put(ProviderTableMeta.FILE_NAME, file.getFileName()); + //cv.put(ProviderTableMeta.FILE_PARENT, file.getParentId()); + cv.put(ProviderTableMeta.FILE_PARENT, folder.getFileId()); + cv.put(ProviderTableMeta.FILE_PATH, file.getRemotePath()); + if (!file.isFolder()) { + cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getStoragePath()); + } + cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name); + cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE, file.getLastSyncDateForProperties()); + cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA, file.getLastSyncDateForData()); + cv.put(ProviderTableMeta.FILE_KEEP_IN_SYNC, file.isAvailableOffline() ? 1 : 0); + cv.put(ProviderTableMeta.FILE_ETAG, file.getEtag()); + cv.put(ProviderTableMeta.FILE_SHARED_VIA_LINK, file.isSharedViaLink() ? 1 : 0); + cv.put(ProviderTableMeta.FILE_SHARED_WITH_SHAREE, file.isSharedWithSharee() ? 1 : 0); + cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, file.getPublicLink()); + cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions()); + cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId()); + cv.put(ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.needsUpdateThumbnail()); + cv.put(ProviderTableMeta.FILE_IS_DOWNLOADING, file.isDownloading()); + cv.put(ProviderTableMeta.FILE_ETAG_IN_CONFLICT, file.getEtagInConflict()); + cv.put(ProviderTableMeta.FILE_FAVORITE, file.getIsFavorite()); + return cv; } diff --git a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java index 276745561b..1f731e740b 100644 --- a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java +++ b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java @@ -425,12 +425,13 @@ public class ThumbnailsCacheManager { thumbnail = doFileInBackground(mFile); } } + } // the app should never break due to a problem with thumbnails + catch (OutOfMemoryError t) { + Log_OC.e(TAG, "Generation of thumbnail for " + mFile.getAbsolutePath() + " failed", t); + System.gc(); } catch (Throwable t) { // the app should never break due to a problem with thumbnails Log_OC.e(TAG, "Generation of thumbnail for " + mFile.getAbsolutePath() + " failed", t); - if (t instanceof OutOfMemoryError) { - System.gc(); - } } return thumbnail; diff --git a/src/main/java/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/main/java/com/owncloud/android/files/InstantUploadBroadcastReceiver.java index 34b07b64d4..977b090077 100644 --- a/src/main/java/com/owncloud/android/files/InstantUploadBroadcastReceiver.java +++ b/src/main/java/com/owncloud/android/files/InstantUploadBroadcastReceiver.java @@ -56,6 +56,13 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { // http://developer.android.com/reference/android/hardware/Camera.html#ACTION_NEW_VIDEO private static final String NEW_VIDEO_ACTION = "android.hardware.action.NEW_VIDEO"; + /** + * Because we support NEW_PHOTO_ACTION and NEW_PHOTO_ACTION_UNOFFICIAL it can happen that + * handleNewPictureAction is called twice for the same photo. Use this simple static variable to + * remember last uploaded photo to filter duplicates. Must not be null! + */ + static String lastUploadedPhotoPath = ""; + @Override public void onReceive(Context context, Intent intent) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { @@ -75,13 +82,6 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { } } - /** - * Because we support NEW_PHOTO_ACTION and NEW_PHOTO_ACTION_UNOFFICIAL it can happen that - * handleNewPictureAction is called twice for the same photo. Use this simple static variable to - * remember last uploaded photo to filter duplicates. Must not be null! - */ - static String lastUploadedPhotoPath = ""; - private void handleNewPictureAction(Context context, Intent intent) { Cursor c = null; String file_path = null; diff --git a/src/main/java/com/owncloud/android/files/services/IndexedForest.java b/src/main/java/com/owncloud/android/files/services/IndexedForest.java index a3c051abe6..dbeb8a225b 100644 --- a/src/main/java/com/owncloud/android/files/services/IndexedForest.java +++ b/src/main/java/com/owncloud/android/files/services/IndexedForest.java @@ -115,7 +115,8 @@ public class IndexedForest { String currentPath = remotePath; String parentPath = null; String parentKey = null; - Node currentNode = valuedNode, parentNode = null; + Node currentNode = valuedNode; + Node parentNode = null; boolean linked = false; while (!OCFile.ROOT_PATH.equals(currentPath) && !linked) { parentPath = new File(currentPath).getParent(); diff --git a/src/main/java/com/owncloud/android/media/MediaControlView.java b/src/main/java/com/owncloud/android/media/MediaControlView.java index fe9faf5ab6..4f01c46afb 100644 --- a/src/main/java/com/owncloud/android/media/MediaControlView.java +++ b/src/main/java/com/owncloud/android/media/MediaControlView.java @@ -197,6 +197,10 @@ public class MediaControlView extends FrameLayout /* implements OnLayoutChangeLi updatePausePlay(); } + public void stopMediaPlayerMessages() { + mHandler.removeMessages(SHOW_PROGRESS); + } + private void initControllerView(View v) { mPauseButton = (ImageButton) v.findViewById(R.id.playBtn); diff --git a/src/main/java/com/owncloud/android/media/MediaService.java b/src/main/java/com/owncloud/android/media/MediaService.java index eb67c18c1c..8f88763831 100644 --- a/src/main/java/com/owncloud/android/media/MediaService.java +++ b/src/main/java/com/owncloud/android/media/MediaService.java @@ -508,7 +508,6 @@ public class MediaService extends Service implements OnCompletionListener, OnPre // nobody is bound processStopRequest(true); } - return; } diff --git a/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java b/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java index 3988516e66..7e56b3ac29 100644 --- a/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java +++ b/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java @@ -98,11 +98,8 @@ public class DetectAuthenticationMethodOperation extends RemoteOperation { // analyze response if (result.getHttpCode() == HttpStatus.SC_UNAUTHORIZED) { String authRequest = ((result.getAuthenticateHeader()).trim()).toLowerCase(); - if (authRequest.startsWith("basic")) { + if (authRequest.startsWith("basic") || authRequest.startsWith("bearer")) { authMethod = AuthenticationMethod.BASIC_HTTP_AUTH; - - } else if (authRequest.startsWith("bearer")) { - authMethod = AuthenticationMethod.BEARER_TOKEN; } // else - fall back to UNKNOWN diff --git a/src/main/java/com/owncloud/android/services/ContactsBackupJob.java b/src/main/java/com/owncloud/android/services/ContactsBackupJob.java index 036e700709..a81140d0ee 100644 --- a/src/main/java/com/owncloud/android/services/ContactsBackupJob.java +++ b/src/main/java/com/owncloud/android/services/ContactsBackupJob.java @@ -1,20 +1,20 @@ -/** +/* * Nextcloud Android client application * * @author Tobias Kaminsky * Copyright (C) 2017 Tobias Kaminsky * Copyright (C) 2017 Nextcloud GmbH. - *

+ * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 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 Affero General Public License for more details. - *

+ * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ @@ -173,7 +173,9 @@ public class ContactsBackupJob extends Job { cal.add(Calendar.DAY_OF_YEAR, -daysToExpire); Long timestampToExpire = cal.getTimeInMillis(); - Log_OC.d(TAG, "expire: " + daysToExpire + " " + backupFolder.getFileName()); + if (backupFolder != null) { + Log_OC.d(TAG, "expire: " + daysToExpire + " " + backupFolder.getFileName()); + } Vector backups = storageManager.getFolderContent(backupFolder, false); diff --git a/src/main/java/com/owncloud/android/ui/CustomPopup.java b/src/main/java/com/owncloud/android/ui/CustomPopup.java index 88c7ee2c1c..24d302edc4 100644 --- a/src/main/java/com/owncloud/android/ui/CustomPopup.java +++ b/src/main/java/com/owncloud/android/ui/CustomPopup.java @@ -136,7 +136,8 @@ public class CustomPopup { LayoutParams.WRAP_CONTENT)); root.measure(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); - int rootW = root.getWidth(), rootH = root.getHeight(); + int rootW = root.getWidth(); + int rootH = root.getHeight(); int screenW = mWManager.getDefaultDisplay().getWidth(); int xpos = ((screenW - rootW) / 2) + x; diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index 3133b6ffe5..df4be91b6e 100644 --- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -509,6 +509,7 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU case Menu.NONE: // account clicked accountClicked(menuItem.getTitle().toString()); + break; default: Log_OC.i(TAG, "Unknown drawer menu item clicked: " + menuItem.getTitle()); } diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index 8286dd1ceb..f611c75945 100644 --- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -316,7 +316,7 @@ public class FileDisplayActivity extends HookActivity dialog.dismiss(); } }) - .setIcon(R.drawable.ic_cloud_upload) + .setIcon(R.drawable.nav_folder_sync) .show(); } } @@ -431,7 +431,12 @@ public class FileDisplayActivity extends HookActivity /// Second fragment OCFile file = getFile(); - Fragment secondFragment = chooseInitialSecondFragment(file); + + Fragment secondFragment = getSecondFragment(); + if (secondFragment == null) { + secondFragment = chooseInitialSecondFragment(file); + } + if (secondFragment != null) { setSecondFragment(secondFragment); updateFragmentsVisibility(true); @@ -470,13 +475,9 @@ public class FileDisplayActivity extends HookActivity Fragment secondFragment = null; if (file != null && !file.isFolder()) { if (file.isDown() && PreviewMediaFragment.canBePreviewed(file)) { - int startPlaybackPosition = - getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0); - boolean autoplay = - getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true); - secondFragment = new PreviewMediaFragment(file, getAccount(), - startPlaybackPosition, autoplay); - + int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0); + boolean autoplay = getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true); + secondFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay); } else if (file.isDown() && PreviewTextFragment.canBePreviewed(file)) { secondFragment = null; } else { @@ -550,8 +551,7 @@ public class FileDisplayActivity extends HookActivity } public FileFragment getSecondFragment() { - Fragment second = getSupportFragmentManager().findFragmentByTag( - FileDisplayActivity.TAG_SECOND_FRAGMENT); + Fragment second = getSupportFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_SECOND_FRAGMENT); if (second != null) { return (FileFragment) second; } @@ -757,7 +757,7 @@ public class FileDisplayActivity extends HookActivity R.drawable.ic_view_list)); getListOfFilesFragment().setGridAsPreferred(); } - return true; + break; } default: retval = super.onOptionsItemSelected(item); diff --git a/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java index e1c6b9b8b0..774889382f 100644 --- a/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java +++ b/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java @@ -49,6 +49,8 @@ public class CreateFolderDialogFragment public static final String CREATE_FOLDER_FRAGMENT = "CREATE_FOLDER_FRAGMENT"; + private OCFile mParentFolder; + /** * Public factory method to create new CreateFolderDialogFragment instances. * @@ -63,9 +65,6 @@ public class CreateFolderDialogFragment return frag; } - - private OCFile mParentFolder; - @Override public Dialog onCreateDialog(Bundle savedInstanceState) { diff --git a/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java index 2b0035a8de..817f1faf78 100644 --- a/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java +++ b/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java @@ -54,6 +54,8 @@ public class RenameFileDialogFragment private static final String ARG_TARGET_FILE = "TARGET_FILE"; + private OCFile mTargetFile; + /** * Public factory method to create new RenameFileDialogFragment instances. * @@ -69,8 +71,6 @@ public class RenameFileDialogFragment } - private OCFile mTargetFile; - @Override public Dialog onCreateDialog(Bundle savedInstanceState) { mTargetFile = getArguments().getParcelable(ARG_TARGET_FILE); diff --git a/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java index 6e524d532d..8f0241a941 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java @@ -287,8 +287,8 @@ public class ExtendedListFragment extends Fragment } public boolean onQueryTextChange(final String query) { - if (getFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_SECOND_FRAGMENT) - instanceof ExtendedListFragment){ + if (getFragmentManager() != null && getFragmentManager(). + findFragmentByTag(FileDisplayActivity.TAG_SECOND_FRAGMENT) instanceof ExtendedListFragment) { performSearch(query, false); return true; } else { diff --git a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java index ba4e5297e4..97655f53a3 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java @@ -23,9 +23,11 @@ package com.owncloud.android.ui.fragment.contactsbackup; import android.Manifest; import android.accounts.Account; +import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.IntentFilter; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -53,6 +55,7 @@ import android.widget.LinearLayout; import com.evernote.android.job.JobRequest; import com.evernote.android.job.util.support.PersistableBundleCompat; import com.owncloud.android.R; +import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader; import com.owncloud.android.lib.common.utils.Log_OC; @@ -104,6 +107,7 @@ public class ContactListFragment extends FileFragment { public Button restoreContacts; private ContactListAdapter contactListAdapter; + private Account account; public static ContactListFragment newInstance(OCFile file, Account account) { ContactListFragment frag = new ContactListFragment(); @@ -142,13 +146,19 @@ public class ContactListFragment extends FileFragment { try { OCFile ocFile = getArguments().getParcelable(FILE_NAME); setFile(ocFile); - Account account = getArguments().getParcelable(ACCOUNT); + account = getArguments().getParcelable(ACCOUNT); if (!ocFile.isDown()) { Intent i = new Intent(getContext(), FileDownloader.class); i.putExtra(FileDownloader.EXTRA_ACCOUNT, account); i.putExtra(FileDownloader.EXTRA_FILE, ocFile); getContext().startService(i); + + // Listen for download messages + IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.getDownloadAddedMessage()); + downloadIntentFilter.addAction(FileDownloader.getDownloadFinishMessage()); + DownloadFinishReceiver mDownloadFinishReceiver = new DownloadFinishReceiver(); + getContext().registerReceiver(mDownloadFinishReceiver, downloadIntentFilter); } else { File file = new File(ocFile.getStoragePath()); vCards.addAll(Ezvcard.parse(file).all()); @@ -446,6 +456,27 @@ public class ContactListFragment extends FileFragment { return displayName; } } + + private class DownloadFinishReceiver extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + if (intent.getAction().equalsIgnoreCase(FileDownloader.getDownloadFinishMessage())){ + String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH); + + FileDataStorageManager storageManager = new FileDataStorageManager(account, + getContext().getContentResolver()); + OCFile ocFile = storageManager.getFileByPath(downloadedRemotePath); + File file = new File(ocFile.getStoragePath()); + + try { + contactListAdapter.replaceVCards(Ezvcard.parse(file).all()); + } catch (IOException e) { + Log_OC.e(TAG, "IO Exception: " + file.getAbsolutePath()); + } + } + } + } } class ContactListAdapter extends RecyclerView.Adapter { @@ -475,6 +506,11 @@ class ContactListAdapter extends RecyclerView.Adapter vCards) { + this.vCards = vCards; + notifyDataSetChanged(); + } + public int[] getCheckedIntArray() { int[] intArray; if (checkedVCards != null && checkedVCards.size() > 0) { diff --git a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java index e133d0a49d..93656385b4 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java @@ -1,4 +1,4 @@ -/** +/* * Nextcloud Android client application * * @author Mario Danic @@ -24,6 +24,7 @@ import android.Manifest; import android.accounts.Account; import android.app.DatePickerDialog; import android.content.DialogInterface; +import android.os.AsyncTask; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -44,7 +45,10 @@ import com.evernote.android.job.JobRequest; import com.evernote.android.job.util.support.PersistableBundleCompat; import com.owncloud.android.R; import com.owncloud.android.datamodel.ArbitraryDataProvider; +import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.operations.RefreshFolderOperation; import com.owncloud.android.services.ContactsBackupJob; import com.owncloud.android.ui.activity.ContactsPreferenceActivity; import com.owncloud.android.ui.fragment.FileFragment; @@ -167,21 +171,48 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi } } - final ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity(); + ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity(); - String backupFolderString = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR; - OCFile backupFolder = contactsPreferenceActivity.getStorageManager().getFileByPath(backupFolderString); + String backupFolderPath = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR; + refreshBackupFolder(backupFolderPath, contactsPreferenceActivity); + } - Vector backupFiles = contactsPreferenceActivity.getStorageManager().getFolderContent(backupFolder, - false); + private void refreshBackupFolder(final String backupFolderPath, + final ContactsPreferenceActivity contactsPreferenceActivity) { + AsyncTask task = new AsyncTask() { + @Override + protected Boolean doInBackground(String... path) { + FileDataStorageManager storageManager = new FileDataStorageManager(account, + getActivity().getContentResolver()); - if (backupFiles == null || backupFiles.size() == 0) { - contactsRestoreHeader.setVisibility(View.GONE); - contactsDatePickerBtn.setVisibility(View.GONE); - } else { - contactsRestoreHeader.setVisibility(View.VISIBLE); - contactsDatePickerBtn.setVisibility(View.VISIBLE); - } + OCFile folder = storageManager.getFileByPath(path[0]); + RefreshFolderOperation operation = new RefreshFolderOperation(folder, System.currentTimeMillis(), + false, false, false, storageManager, account, getContext()); + + RemoteOperationResult result = operation.execute(account, getContext()); + return result.isSuccess(); + } + + @Override + protected void onPostExecute(Boolean result) { + if (result) { + OCFile backupFolder = contactsPreferenceActivity.getStorageManager().getFileByPath(backupFolderPath); + + Vector backupFiles = contactsPreferenceActivity.getStorageManager() + .getFolderContent(backupFolder, false); + + if (backupFiles == null || backupFiles.size() == 0) { + contactsRestoreHeader.setVisibility(View.GONE); + contactsDatePickerBtn.setVisibility(View.GONE); + } else { + contactsRestoreHeader.setVisibility(View.VISIBLE); + contactsDatePickerBtn.setVisibility(View.VISIBLE); + } + } + } + }; + + task.execute(backupFolderPath); } diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 8dd794667a..ed759c97d8 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -106,6 +106,7 @@ public class PreviewMediaFragment extends FileFragment implements private MediaServiceConnection mMediaServiceConnection = null; private VideoHelper mVideoHelper; private boolean mAutoplay; + private static boolean mOnResume = false; public boolean mPrepared; private static final String TAG = PreviewMediaFragment.class.getSimpleName(); @@ -220,6 +221,7 @@ public class PreviewMediaFragment extends FileFragment implements */ @Override public void onActivityCreated(Bundle savedInstanceState) { + mOnResume = true; super.onActivityCreated(savedInstanceState); Log_OC.v(TAG, "onActivityCreated"); @@ -234,14 +236,11 @@ public class PreviewMediaFragment extends FileFragment implements if (!file.isDown()) { throw new IllegalStateException("There is no local file to preview"); } - - } - else { - file = (OCFile) savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_FILE); + } else { + file = savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_FILE); setFile(file); mAccount = savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_ACCOUNT); - mSavedPlaybackPosition = - savedInstanceState.getInt(PreviewMediaFragment.EXTRA_PLAY_POSITION); + mSavedPlaybackPosition = savedInstanceState.getInt(PreviewMediaFragment.EXTRA_PLAY_POSITION); mAutoplay = savedInstanceState.getBoolean(PreviewMediaFragment.EXTRA_PLAYING); } @@ -251,15 +250,12 @@ public class PreviewMediaFragment extends FileFragment implements mVideoPreview.setVisibility(View.VISIBLE); mImagePreview.setVisibility(View.GONE); prepareVideo(); - - } - else { + } else { mVideoPreview.setVisibility(View.GONE); mImagePreview.setVisibility(View.VISIBLE); extractAndSetCoverArt(file); } } - } /** @@ -307,11 +303,8 @@ public class PreviewMediaFragment extends FileFragment implements } else { if (mMediaServiceBinder != null) { - outState.putInt( - PreviewMediaFragment.EXTRA_PLAY_POSITION, - mMediaServiceBinder.getCurrentPosition()); - outState.putBoolean( - PreviewMediaFragment.EXTRA_PLAYING, mMediaServiceBinder.isPlaying()); + outState.putInt(PreviewMediaFragment.EXTRA_PLAY_POSITION, mMediaServiceBinder.getCurrentPosition()); + outState.putBoolean(PreviewMediaFragment.EXTRA_PLAYING, mMediaServiceBinder.isPlaying()); } } } @@ -565,6 +558,8 @@ public class PreviewMediaFragment extends FileFragment implements @Override public void onResume() { super.onResume(); + mOnResume = !mOnResume; + if (getActivity() != null) { AnalyticsUtils.setCurrentScreenName(getActivity(), SCREEN_NAME, TAG); } @@ -585,6 +580,7 @@ public class PreviewMediaFragment extends FileFragment implements if (mMediaServiceConnection != null) { Log_OC.d(TAG, "Unbinding from MediaService ..."); if (mMediaServiceBinder != null && mMediaController != null) { + mMediaController.stopMediaPlayerMessages(); mMediaServiceBinder.unregisterMediaController(mMediaController); } getActivity().unbindService(mMediaServiceConnection); @@ -638,7 +634,7 @@ public class PreviewMediaFragment extends FileFragment implements private void playAudio() { OCFile file = getFile(); - if (!mMediaServiceBinder.isPlaying(file)) { + if (!mMediaServiceBinder.isPlaying(file) && !mOnResume) { Log_OC.d(TAG, "starting playback of " + file.getStoragePath()); mMediaServiceBinder.start(mAccount, file, mAutoplay, mSavedPlaybackPosition); @@ -649,6 +645,8 @@ public class PreviewMediaFragment extends FileFragment implements mMediaController.updatePausePlay(); } } + + mOnResume = false; } diff --git a/src/main/res/drawable-hdpi/nav_activity.png b/src/main/res/drawable-hdpi/nav_activity.png new file mode 100644 index 0000000000..f955a2d722 Binary files /dev/null and b/src/main/res/drawable-hdpi/nav_activity.png differ diff --git a/src/main/res/drawable-hdpi/ic_folder_open.png b/src/main/res/drawable-hdpi/nav_all_files.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_folder_open.png rename to src/main/res/drawable-hdpi/nav_all_files.png diff --git a/src/main/res/drawable-hdpi/nav_contacts.png b/src/main/res/drawable-hdpi/nav_contacts.png new file mode 100644 index 0000000000..72b2171642 Binary files /dev/null and b/src/main/res/drawable-hdpi/nav_contacts.png differ diff --git a/src/main/res/drawable-hdpi/ic_star.png b/src/main/res/drawable-hdpi/nav_favorites.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_star.png rename to src/main/res/drawable-hdpi/nav_favorites.png diff --git a/src/main/res/drawable-hdpi/ic_cloud_upload.png b/src/main/res/drawable-hdpi/nav_folder_sync.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_cloud_upload.png rename to src/main/res/drawable-hdpi/nav_folder_sync.png diff --git a/src/main/res/drawable-hdpi/logout.png b/src/main/res/drawable-hdpi/nav_logout.png similarity index 100% rename from src/main/res/drawable-hdpi/logout.png rename to src/main/res/drawable-hdpi/nav_logout.png diff --git a/src/main/res/drawable-hdpi/nav_notifications.png b/src/main/res/drawable-hdpi/nav_notifications.png new file mode 100644 index 0000000000..deac351b3f Binary files /dev/null and b/src/main/res/drawable-hdpi/nav_notifications.png differ diff --git a/src/main/res/drawable-hdpi/ic_action_available_offline.png b/src/main/res/drawable-hdpi/nav_on_device.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_action_available_offline.png rename to src/main/res/drawable-hdpi/nav_on_device.png diff --git a/src/main/res/drawable-hdpi/ic_participate.png b/src/main/res/drawable-hdpi/nav_participate.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_participate.png rename to src/main/res/drawable-hdpi/nav_participate.png diff --git a/src/main/res/drawable-hdpi/nav_photos.png b/src/main/res/drawable-hdpi/nav_photos.png new file mode 100644 index 0000000000..dafb3ebddf Binary files /dev/null and b/src/main/res/drawable-hdpi/nav_photos.png differ diff --git a/src/main/res/drawable-hdpi/ic_recent.png b/src/main/res/drawable-hdpi/nav_recently.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_recent.png rename to src/main/res/drawable-hdpi/nav_recently.png diff --git a/src/main/res/drawable-hdpi/nav_settings.png b/src/main/res/drawable-hdpi/nav_settings.png new file mode 100644 index 0000000000..ffa2d55223 Binary files /dev/null and b/src/main/res/drawable-hdpi/nav_settings.png differ diff --git a/src/main/res/drawable-hdpi/ic_shared.png b/src/main/res/drawable-hdpi/nav_shared.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_shared.png rename to src/main/res/drawable-hdpi/nav_shared.png diff --git a/src/main/res/drawable-hdpi/ic_uploads.png b/src/main/res/drawable-hdpi/nav_uploads.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_uploads.png rename to src/main/res/drawable-hdpi/nav_uploads.png diff --git a/src/main/res/drawable-hdpi/nav_videos.png b/src/main/res/drawable-hdpi/nav_videos.png new file mode 100644 index 0000000000..0484426475 Binary files /dev/null and b/src/main/res/drawable-hdpi/nav_videos.png differ diff --git a/src/main/res/drawable-mdpi/nav_activity.png b/src/main/res/drawable-mdpi/nav_activity.png new file mode 100644 index 0000000000..1f180b100e Binary files /dev/null and b/src/main/res/drawable-mdpi/nav_activity.png differ diff --git a/src/main/res/drawable-mdpi/nav_all_files.png b/src/main/res/drawable-mdpi/nav_all_files.png new file mode 100644 index 0000000000..0a53eea0df Binary files /dev/null and b/src/main/res/drawable-mdpi/nav_all_files.png differ diff --git a/src/main/res/drawable-mdpi/nav_contacts.png b/src/main/res/drawable-mdpi/nav_contacts.png new file mode 100644 index 0000000000..344baee588 Binary files /dev/null and b/src/main/res/drawable-mdpi/nav_contacts.png differ diff --git a/src/main/res/drawable-mdpi/ic_star.png b/src/main/res/drawable-mdpi/nav_favorites.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_star.png rename to src/main/res/drawable-mdpi/nav_favorites.png diff --git a/src/main/res/drawable-mdpi/ic_cloud_upload.png b/src/main/res/drawable-mdpi/nav_folder_sync.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_cloud_upload.png rename to src/main/res/drawable-mdpi/nav_folder_sync.png diff --git a/src/main/res/drawable-mdpi/logout.png b/src/main/res/drawable-mdpi/nav_logout.png similarity index 100% rename from src/main/res/drawable-mdpi/logout.png rename to src/main/res/drawable-mdpi/nav_logout.png diff --git a/src/main/res/drawable-mdpi/nav_notifications.png b/src/main/res/drawable-mdpi/nav_notifications.png new file mode 100644 index 0000000000..2e35a0cf89 Binary files /dev/null and b/src/main/res/drawable-mdpi/nav_notifications.png differ diff --git a/src/main/res/drawable-mdpi/ic_action_available_offline.png b/src/main/res/drawable-mdpi/nav_on_device.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_action_available_offline.png rename to src/main/res/drawable-mdpi/nav_on_device.png diff --git a/src/main/res/drawable-mdpi/ic_participate.png b/src/main/res/drawable-mdpi/nav_participate.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_participate.png rename to src/main/res/drawable-mdpi/nav_participate.png diff --git a/src/main/res/drawable-mdpi/nav_photos.png b/src/main/res/drawable-mdpi/nav_photos.png new file mode 100644 index 0000000000..520c19889d Binary files /dev/null and b/src/main/res/drawable-mdpi/nav_photos.png differ diff --git a/src/main/res/drawable-mdpi/ic_recent.png b/src/main/res/drawable-mdpi/nav_recently.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_recent.png rename to src/main/res/drawable-mdpi/nav_recently.png diff --git a/src/main/res/drawable-mdpi/nav_settings.png b/src/main/res/drawable-mdpi/nav_settings.png new file mode 100644 index 0000000000..20d7dd8f59 Binary files /dev/null and b/src/main/res/drawable-mdpi/nav_settings.png differ diff --git a/src/main/res/drawable-mdpi/ic_shared.png b/src/main/res/drawable-mdpi/nav_shared.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_shared.png rename to src/main/res/drawable-mdpi/nav_shared.png diff --git a/src/main/res/drawable-mdpi/ic_uploads.png b/src/main/res/drawable-mdpi/nav_uploads.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_uploads.png rename to src/main/res/drawable-mdpi/nav_uploads.png diff --git a/src/main/res/drawable-mdpi/nav_videos.png b/src/main/res/drawable-mdpi/nav_videos.png new file mode 100644 index 0000000000..9c1f16c29b Binary files /dev/null and b/src/main/res/drawable-mdpi/nav_videos.png differ diff --git a/src/main/res/drawable-xhdpi/nav_activity.png b/src/main/res/drawable-xhdpi/nav_activity.png new file mode 100644 index 0000000000..38656b3223 Binary files /dev/null and b/src/main/res/drawable-xhdpi/nav_activity.png differ diff --git a/src/main/res/drawable-xhdpi/ic_folder_open.png b/src/main/res/drawable-xhdpi/nav_all_files.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_folder_open.png rename to src/main/res/drawable-xhdpi/nav_all_files.png diff --git a/src/main/res/drawable-xhdpi/nav_contacts.png b/src/main/res/drawable-xhdpi/nav_contacts.png new file mode 100644 index 0000000000..bb54af5792 Binary files /dev/null and b/src/main/res/drawable-xhdpi/nav_contacts.png differ diff --git a/src/main/res/drawable-xhdpi/ic_star.png b/src/main/res/drawable-xhdpi/nav_favorites.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_star.png rename to src/main/res/drawable-xhdpi/nav_favorites.png diff --git a/src/main/res/drawable-xhdpi/ic_cloud_upload.png b/src/main/res/drawable-xhdpi/nav_folder_sync.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_cloud_upload.png rename to src/main/res/drawable-xhdpi/nav_folder_sync.png diff --git a/src/main/res/drawable-xhdpi/logout.png b/src/main/res/drawable-xhdpi/nav_logout.png similarity index 100% rename from src/main/res/drawable-xhdpi/logout.png rename to src/main/res/drawable-xhdpi/nav_logout.png diff --git a/src/main/res/drawable-xhdpi/nav_notifications.png b/src/main/res/drawable-xhdpi/nav_notifications.png new file mode 100644 index 0000000000..d035a62131 Binary files /dev/null and b/src/main/res/drawable-xhdpi/nav_notifications.png differ diff --git a/src/main/res/drawable-xhdpi/ic_action_available_offline.png b/src/main/res/drawable-xhdpi/nav_on_device.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_action_available_offline.png rename to src/main/res/drawable-xhdpi/nav_on_device.png diff --git a/src/main/res/drawable-xhdpi/ic_participate.png b/src/main/res/drawable-xhdpi/nav_participate.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_participate.png rename to src/main/res/drawable-xhdpi/nav_participate.png diff --git a/src/main/res/drawable-xhdpi/nav_photos.png b/src/main/res/drawable-xhdpi/nav_photos.png new file mode 100644 index 0000000000..c2925e7499 Binary files /dev/null and b/src/main/res/drawable-xhdpi/nav_photos.png differ diff --git a/src/main/res/drawable-xhdpi/ic_recent.png b/src/main/res/drawable-xhdpi/nav_recently.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_recent.png rename to src/main/res/drawable-xhdpi/nav_recently.png diff --git a/src/main/res/drawable-xhdpi/nav_settings.png b/src/main/res/drawable-xhdpi/nav_settings.png new file mode 100644 index 0000000000..a19fc5c312 Binary files /dev/null and b/src/main/res/drawable-xhdpi/nav_settings.png differ diff --git a/src/main/res/drawable-xhdpi/ic_shared.png b/src/main/res/drawable-xhdpi/nav_shared.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_shared.png rename to src/main/res/drawable-xhdpi/nav_shared.png diff --git a/src/main/res/drawable-xhdpi/ic_uploads.png b/src/main/res/drawable-xhdpi/nav_uploads.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_uploads.png rename to src/main/res/drawable-xhdpi/nav_uploads.png diff --git a/src/main/res/drawable-xhdpi/nav_videos.png b/src/main/res/drawable-xhdpi/nav_videos.png new file mode 100644 index 0000000000..868a92280e Binary files /dev/null and b/src/main/res/drawable-xhdpi/nav_videos.png differ diff --git a/src/main/res/drawable-xxhdpi/nav_activity.png b/src/main/res/drawable-xxhdpi/nav_activity.png new file mode 100644 index 0000000000..01ce6a3776 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/nav_activity.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_folder_open.png b/src/main/res/drawable-xxhdpi/nav_all_files.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_folder_open.png rename to src/main/res/drawable-xxhdpi/nav_all_files.png diff --git a/src/main/res/drawable-xxhdpi/nav_contacts.png b/src/main/res/drawable-xxhdpi/nav_contacts.png new file mode 100644 index 0000000000..f36e4cba94 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/nav_contacts.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_star.png b/src/main/res/drawable-xxhdpi/nav_favorites.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_star.png rename to src/main/res/drawable-xxhdpi/nav_favorites.png diff --git a/src/main/res/drawable-xxhdpi/ic_cloud_upload.png b/src/main/res/drawable-xxhdpi/nav_folder_sync.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_cloud_upload.png rename to src/main/res/drawable-xxhdpi/nav_folder_sync.png diff --git a/src/main/res/drawable-xxhdpi/logout.png b/src/main/res/drawable-xxhdpi/nav_logout.png similarity index 100% rename from src/main/res/drawable-xxhdpi/logout.png rename to src/main/res/drawable-xxhdpi/nav_logout.png diff --git a/src/main/res/drawable-xxhdpi/nav_notifications.png b/src/main/res/drawable-xxhdpi/nav_notifications.png new file mode 100644 index 0000000000..c9f289646c Binary files /dev/null and b/src/main/res/drawable-xxhdpi/nav_notifications.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_available_offline.png b/src/main/res/drawable-xxhdpi/nav_on_device.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_action_available_offline.png rename to src/main/res/drawable-xxhdpi/nav_on_device.png diff --git a/src/main/res/drawable-xxhdpi/ic_participate.png b/src/main/res/drawable-xxhdpi/nav_participate.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_participate.png rename to src/main/res/drawable-xxhdpi/nav_participate.png diff --git a/src/main/res/drawable-xxhdpi/nav_photos.png b/src/main/res/drawable-xxhdpi/nav_photos.png new file mode 100644 index 0000000000..8f6c05555a Binary files /dev/null and b/src/main/res/drawable-xxhdpi/nav_photos.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_recent.png b/src/main/res/drawable-xxhdpi/nav_recently.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_recent.png rename to src/main/res/drawable-xxhdpi/nav_recently.png diff --git a/src/main/res/drawable-xxhdpi/nav_settings.png b/src/main/res/drawable-xxhdpi/nav_settings.png new file mode 100644 index 0000000000..6a70402b4f Binary files /dev/null and b/src/main/res/drawable-xxhdpi/nav_settings.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_shared.png b/src/main/res/drawable-xxhdpi/nav_shared.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_shared.png rename to src/main/res/drawable-xxhdpi/nav_shared.png diff --git a/src/main/res/drawable-xxhdpi/ic_uploads.png b/src/main/res/drawable-xxhdpi/nav_uploads.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_uploads.png rename to src/main/res/drawable-xxhdpi/nav_uploads.png diff --git a/src/main/res/drawable-xxhdpi/nav_videos.png b/src/main/res/drawable-xxhdpi/nav_videos.png new file mode 100644 index 0000000000..bb38967c7d Binary files /dev/null and b/src/main/res/drawable-xxhdpi/nav_videos.png differ diff --git a/src/main/res/drawable-xxxhdpi/nav_activity.png b/src/main/res/drawable-xxxhdpi/nav_activity.png new file mode 100644 index 0000000000..38507dcf75 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/nav_activity.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_star.png b/src/main/res/drawable-xxxhdpi/nav_favorites.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/ic_star.png rename to src/main/res/drawable-xxxhdpi/nav_favorites.png diff --git a/src/main/res/drawable-xxxhdpi/ic_cloud_upload.png b/src/main/res/drawable-xxxhdpi/nav_folder_sync.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/ic_cloud_upload.png rename to src/main/res/drawable-xxxhdpi/nav_folder_sync.png diff --git a/src/main/res/drawable-xxxhdpi/logout.png b/src/main/res/drawable-xxxhdpi/nav_logout.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/logout.png rename to src/main/res/drawable-xxxhdpi/nav_logout.png diff --git a/src/main/res/drawable-xxxhdpi/nav_notifications.png b/src/main/res/drawable-xxxhdpi/nav_notifications.png new file mode 100644 index 0000000000..f3e93fbd21 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/nav_notifications.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_action_available_offline.png b/src/main/res/drawable-xxxhdpi/nav_on_device.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/ic_action_available_offline.png rename to src/main/res/drawable-xxxhdpi/nav_on_device.png diff --git a/src/main/res/drawable-xxxhdpi/ic_participate.png b/src/main/res/drawable-xxxhdpi/nav_participate.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/ic_participate.png rename to src/main/res/drawable-xxxhdpi/nav_participate.png diff --git a/src/main/res/drawable-xxxhdpi/nav_photos.png b/src/main/res/drawable-xxxhdpi/nav_photos.png new file mode 100644 index 0000000000..ff05d008fb Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/nav_photos.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_recent.png b/src/main/res/drawable-xxxhdpi/nav_recently.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/ic_recent.png rename to src/main/res/drawable-xxxhdpi/nav_recently.png diff --git a/src/main/res/drawable-xxxhdpi/nav_settings.png b/src/main/res/drawable-xxxhdpi/nav_settings.png new file mode 100644 index 0000000000..64f0ad73f6 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/nav_settings.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_shared.png b/src/main/res/drawable-xxxhdpi/nav_shared.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/ic_shared.png rename to src/main/res/drawable-xxxhdpi/nav_shared.png diff --git a/src/main/res/drawable-xxxhdpi/ic_uploads.png b/src/main/res/drawable-xxxhdpi/nav_uploads.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/ic_uploads.png rename to src/main/res/drawable-xxxhdpi/nav_uploads.png diff --git a/src/main/res/drawable-xxxhdpi/nav_videos.png b/src/main/res/drawable-xxxhdpi/nav_videos.png new file mode 100644 index 0000000000..da3b3854fb Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/nav_videos.png differ diff --git a/src/main/res/layout/contacts_backup_fragment.xml b/src/main/res/layout/contacts_backup_fragment.xml index 84f05a78b6..d9c17a1293 100644 --- a/src/main/res/layout/contacts_backup_fragment.xml +++ b/src/main/res/layout/contacts_backup_fragment.xml @@ -90,7 +90,8 @@ android:layout_marginTop="@dimen/standard_margin" android:text="@string/contacts_header_restore" android:textColor="@color/primary" - android:textStyle="bold"/> + android:textStyle="bold" + android:visibility="gone"/> + android:theme="@style/Button.Primary" + android:visibility="gone"/> diff --git a/src/main/res/menu/drawer_menu.xml b/src/main/res/menu/drawer_menu.xml index 4cacf63dd8..764a14a4d9 100644 --- a/src/main/res/menu/drawer_menu.xml +++ b/src/main/res/menu/drawer_menu.xml @@ -27,65 +27,65 @@ android:checkableBehavior="single"> @@ -124,22 +124,22 @@ android:checkableBehavior="single"> diff --git a/src/main/res/menu/navigation_bar_menu.xml b/src/main/res/menu/navigation_bar_menu.xml index b076206baf..c8037a372d 100644 --- a/src/main/res/menu/navigation_bar_menu.xml +++ b/src/main/res/menu/navigation_bar_menu.xml @@ -2,18 +2,18 @@

\ No newline at end of file diff --git a/src/main/res/values-af-rZA/strings.xml b/src/main/res/values-af-rZA/strings.xml index 07457cb1cb..c3eb90990b 100644 --- a/src/main/res/values-af-rZA/strings.xml +++ b/src/main/res/values-af-rZA/strings.xml @@ -18,7 +18,6 @@ Kanseleer Fout Stuur - Kies Stel verval datum Beskerm met Wagwoord diff --git a/src/main/res/values-ak/strings.xml b/src/main/res/values-ak/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-ak/strings.xml +++ b/src/main/res/values-ak/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-am-rET/strings.xml b/src/main/res/values-am-rET/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-am-rET/strings.xml +++ b/src/main/res/values-am-rET/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 451198d6f0..848f998dae 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -264,7 +264,6 @@ حدث خطأ أثناء إنتظار الخادم، لم يكن من الممكن القيام بالعملية حدث خطأ أثناء إنتظار الخادم، لم يكن من الممكن القيام بالعملية تعذر إكمال العملية، الخادم غير متوفر - حسابات سجل كلمة مرور خاطئة diff --git a/src/main/res/values-ast/strings.xml b/src/main/res/values-ast/strings.xml index 6853699aa4..48a34ab966 100644 --- a/src/main/res/values-ast/strings.xml +++ b/src/main/res/values-ast/strings.xml @@ -168,6 +168,7 @@ Los conteníos de los ficheros %1$d pueden nun tar sincronizaos (%2$d conflictos) Dexáronse dalgunos ficheros llocales. Los ficheros %1$d fuera de la carpeta %2$s nun puen copiase dientro + Lo mesmo que na versión 1.3.16, los archivos xubíos dende esti preséu copiáronse dientro la carpeta llocal %1$s pa prevenir la perda de datos cuando un ficheru se sincroniza con múltiples cuentes Por mor d\'esti cambéu, tolos ficheros xubíos en versiones previes d\'esta aplicación tán copiaos na carpeta %2$s . Por embargu, un error torgó\'l pieslle de la operación demientres la sincronización de la cuenta. Pues dexar el/los ficheru/os como tán, desaniciar l\'enllaz a %3$s , o mover el/los ficheru/os a la carpeta %1$s y guardar l\'enllaz a %4$s . El llistáu d\'abaxo contién los ficheros llocales y remotos enllazaos en %5$s La carpeta %1$s yá nun esiste Mover too Moviéronse tolos ficheros diff --git a/src/main/res/values-az/strings.xml b/src/main/res/values-az/strings.xml index d894f71fd2..987e9dc5dd 100644 --- a/src/main/res/values-az/strings.xml +++ b/src/main/res/values-az/strings.xml @@ -226,7 +226,6 @@ inzibatçınızla əlaqə saxlayasınız. Serveri gözlədiyimiz müddətdə səhv baş verdi, əməliyyat bitə bilməz Serveri gözlədiyimiz müddətdə səhv baş verdi, əməliyyat bitə bilməz Əməliyyat bitə bilməz, serverə çatmaq mümkün deyil - Sizin yetkiniz yoxdur %s faylın adını dəyişmək bu faylı silmək üçün diff --git a/src/main/res/values-bal/strings.xml b/src/main/res/values-bal/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-bal/strings.xml +++ b/src/main/res/values-bal/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-be/strings.xml b/src/main/res/values-be/strings.xml index a3e277cf6e..a91336b08e 100644 --- a/src/main/res/values-be/strings.xml +++ b/src/main/res/values-be/strings.xml @@ -12,6 +12,5 @@ Не Добра Памылка - Выбар diff --git a/src/main/res/values-bn-rBD/strings.xml b/src/main/res/values-bn-rBD/strings.xml index 43e2e4b3f8..518f311697 100644 --- a/src/main/res/values-bn-rBD/strings.xml +++ b/src/main/res/values-bn-rBD/strings.xml @@ -205,7 +205,6 @@ সার্ভারের জন্য অপেক্ষা করার সময় একটি ভ্রান্তি ঘটলো, কাজটি করা যেতনা সার্ভারের জন্য অপেক্ষা করার সময় একটি ভ্রান্তি ঘটলো, কাজটি করা যেতনা কাজটি সম্পন্ন করা গেলনা, সার্ভার সংযোগ পাওয়া যাচ্ছেনা - আপনার %s অনুমতি নেই ফাইলটি পূনঃনামকরণ করতে ফাইলটি মুছে ফেলতে diff --git a/src/main/res/values-bn-rIN/strings.xml b/src/main/res/values-bn-rIN/strings.xml index a009ed8d06..097d22d5a1 100644 --- a/src/main/res/values-bn-rIN/strings.xml +++ b/src/main/res/values-bn-rIN/strings.xml @@ -21,6 +21,5 @@ ফোল্ডারের নাম পুনঃনামকরণ সরান - অনুসন্ধান diff --git a/src/main/res/values-br/strings.xml b/src/main/res/values-br/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-br/strings.xml +++ b/src/main/res/values-br/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-bs/strings.xml b/src/main/res/values-bs/strings.xml index 61fb77a82c..9a4c43b435 100644 --- a/src/main/res/values-bs/strings.xml +++ b/src/main/res/values-bs/strings.xml @@ -33,7 +33,6 @@ Nepoznata greška Preimenuj Pošalji - Potrebna autentifikacija Pogrešna lozinka Izaberite diff --git a/src/main/res/values-cs-rCZ/strings.xml b/src/main/res/values-cs-rCZ/strings.xml index eb2c48e98a..321ef1571a 100644 --- a/src/main/res/values-cs-rCZ/strings.xml +++ b/src/main/res/values-cs-rCZ/strings.xml @@ -403,7 +403,6 @@ CHYBA: V průběhu migrace CHYBA: V průběhu aktualizace indexu - Datový adresář již existuje, co teď? Nahradit Použít @@ -540,6 +539,10 @@ Předběžná verze Předběžná verze nebo také Release Candidate (RC) je stabilní stav připravované, finální verze. Přihlas se jako tester v Play store nebo si najdi a instaluj hodící se verzi z F-Droid pod \"Verze\". Aktivně něčím přispět + Diskutovat na IRC: <a href=\"%1$s\">#nextcloud-mobile</a> + Pomozte ostatním na <a href=\"%1$s\">fóru</a> + <a href=\"%1$s\">Přeložte</a> aplikaci + Přispět jako vývojář, detaily pod <a href=\"%1$s\">CONTRIBUTING.md</a> Přesunout do… Kopírovat do… Vybrat adresář… diff --git a/src/main/res/values-cy-rGB/strings.xml b/src/main/res/values-cy-rGB/strings.xml index 50591bdcb5..89ac3cc1d2 100644 --- a/src/main/res/values-cy-rGB/strings.xml +++ b/src/main/res/values-cy-rGB/strings.xml @@ -113,7 +113,6 @@ /LlwythoSyth Cadw\'r ddau Anfon - Cyfrifon Dewisiwch Manylion diff --git a/src/main/res/values-de-rAT/strings.xml b/src/main/res/values-de-rAT/strings.xml index 9d50da6413..a24ff3d3da 100644 --- a/src/main/res/values-de-rAT/strings.xml +++ b/src/main/res/values-de-rAT/strings.xml @@ -90,7 +90,6 @@ Umbenennen Details Senden - Konten Auswählen Details diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml index abfc6e9907..8a6f46c52d 100644 --- a/src/main/res/values-de-rDE/strings.xml +++ b/src/main/res/values-de-rDE/strings.xml @@ -269,7 +269,7 @@ Die Autorisierung ist abgelaufen. Bitte Autorisierung nochmals durchführen Bitte gib das aktuelle Passwort ein Ihre Sitzung ist abgelaufen. Bitte erneut verbinden - Verbinden zum Authentifizierungs-Server ... + Verbinden zum Authentifizierungs-Server … Der Server unterstützt diese Authentifizierung-Methode nicht %1$s unterstützt nicht mehrere Benutzerkonten Ihr Server gibt keine korrekte Benutzer-ID zurück, bitte kontaktieren Sie einen Administrator @@ -297,7 +297,7 @@ Verbotene Zeichen: / \\ < > : \" | ? * Der Dateiname enthält mindestens ein ungültiges Zeichen Dateiname darf nicht leer sein - Bitte warten... + Bitte warten … Überprüfe gespeicherte Anmeldeinformationen Ein unerwartetes Problem ist aufgetreten. Bitte versuche, die Datei in einer anderen App zu öffnen Keine Datei gewählt @@ -305,7 +305,7 @@ Kopiere Datei vom privatem Speicher Anmelden mit oAuth2 - Verbinde mit dem oAuth2-Server... + Verbinde mit dem OAuth2-Server … Die Identität der Website konnte nicht überprüft werden - Das Zertifikat des Servers ist nicht vertrauenswürdig @@ -418,7 +418,6 @@ FEHLER: Migration fehlgeschlagen FEHLER: Während der Aktualisierung des Indexes - Datenordner existiert bereits, was soll geschehen? Überschreiben Verwende bestehenden @@ -659,4 +658,5 @@ Abmelden Keine App gefunden, mit der ein Bid gesetzt werden könnte! Datenschutz - + + diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index d06f0f6cc9..dcd00d4ae7 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -418,7 +418,6 @@ FEHLER: Migration fehlgeschlagen FEHLER: Während der Aktualisierung des Indexes - Datenordner existiert bereits, was soll geschehen? Überschreiben Verwende bestehenden @@ -660,4 +659,5 @@ Abmelden Keine App gefunden, mit der ein Bid gesetzt werden könnte! Datenschutz - + + diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 8b13948abe..a1b2d52fad 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -417,7 +417,6 @@ ΣΦΑΛΜΑ: Κατά την μεταφορά ΣΦΑΛΜΑ: Κατά την ενημέρωση ευρετηρίου - Ο φάκελος των δεδομένων υπάρχει ήδη, τι να κάνω; Αντικατάσταση Χρήση @@ -557,6 +556,10 @@ Release candidate Η υποψήφια κυκλοφορία (RC) είναι ένα στιγμιότυπο της επερχόμενης έκδοσης και αναμένεται να είναι σταθερή. Η δοκιμή της μεμονωμένης εγκατάστασής σας θα βοηθήσει στην εξασφάλιση αυτού. Εγγραφείτε για δοκιμές στο Play store ή χειροκίνητα αναζητείστε στο τμήμα \"εκδόσεις\" στο F-Droid. Ενεργή συνεισφορά + Συμμετέχετε στη συνομιλία στο IRC: <a href=\"%1$s\">#nextcloud-mobile</a> + Βοηθήστε χρήστες στο <a href=\"%1$s\">forum</a> + <a href=\"%1$s\">Μεταφράστε</a> την εφαρμογή + Συνεισφέρετε ως προγραμματιστής, για περισσότερες λεπτομέρειες δείτε <a href=\"%1$s\">CONTRIBUTING.md</a> Μετακίνηση σε… Αντιγραφή σε… Επιλογή φακέλου… diff --git a/src/main/res/values-en-rGB/strings.xml b/src/main/res/values-en-rGB/strings.xml index de46f62324..b3852dba3f 100644 --- a/src/main/res/values-en-rGB/strings.xml +++ b/src/main/res/values-en-rGB/strings.xml @@ -417,7 +417,6 @@ ERROR: Failed during migration ERROR: Failed to updating index - Data folder exists already. Choose one of the following: Replace Use @@ -658,4 +657,5 @@ Logout No app found to set a picture with! Privacy - + + diff --git a/src/main/res/values-en-rNZ/strings.xml b/src/main/res/values-en-rNZ/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-en-rNZ/strings.xml +++ b/src/main/res/values-en-rNZ/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-en-rUS/strings.xml b/src/main/res/values-en-rUS/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-en-rUS/strings.xml +++ b/src/main/res/values-en-rUS/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-eo/strings.xml b/src/main/res/values-eo/strings.xml index 060329fc74..4c808bd1ab 100644 --- a/src/main/res/values-eo/strings.xml +++ b/src/main/res/values-eo/strings.xml @@ -207,7 +207,6 @@ Kopii ligilon Kopiita en la tondejon Eraro okazis dum konekto al la servilo. - Vi ne permesatas %s por alinomigi ĉi tiun dosieron por forigi ĉi tiun dosieron diff --git a/src/main/res/values-es-rAR/strings.xml b/src/main/res/values-es-rAR/strings.xml index c4d5736352..5d90cb63f9 100644 --- a/src/main/res/values-es-rAR/strings.xml +++ b/src/main/res/values-es-rAR/strings.xml @@ -220,7 +220,6 @@ Un error ocurrió mientras se conectaba con el Servidor. La operación no se realizó Un error ocurrió esperando al Servidor, la operación no se realizó Operación no completada, Servidor no disponible. - Tu no tienes permiso %s para renombrar este archivo para borrar este archivo diff --git a/src/main/res/values-es-rBO/strings.xml b/src/main/res/values-es-rBO/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rBO/strings.xml +++ b/src/main/res/values-es-rBO/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es-rCL/strings.xml b/src/main/res/values-es-rCL/strings.xml index 52a2380b03..5351af1dc7 100644 --- a/src/main/res/values-es-rCL/strings.xml +++ b/src/main/res/values-es-rCL/strings.xml @@ -134,7 +134,6 @@ algoritmo Mantener ambos %1$s no pudo ser copiado a la carpeta local %2$s - Cuentas Choose detalles diff --git a/src/main/res/values-es-rCO/strings.xml b/src/main/res/values-es-rCO/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rCO/strings.xml +++ b/src/main/res/values-es-rCO/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es-rCR/strings.xml b/src/main/res/values-es-rCR/strings.xml index 123109707f..a49546500f 100644 --- a/src/main/res/values-es-rCR/strings.xml +++ b/src/main/res/values-es-rCR/strings.xml @@ -8,5 +8,4 @@ Archivos - diff --git a/src/main/res/values-es-rEC/strings.xml b/src/main/res/values-es-rEC/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rEC/strings.xml +++ b/src/main/res/values-es-rEC/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es-rES/strings.xml b/src/main/res/values-es-rES/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rES/strings.xml +++ b/src/main/res/values-es-rES/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml index 9239bf5ede..7954c705b5 100644 --- a/src/main/res/values-es-rMX/strings.xml +++ b/src/main/res/values-es-rMX/strings.xml @@ -418,7 +418,6 @@ en los últimos 7 días. ERROR: Falla durante la migración ERROR: Falla durante la actualización del índice - La carpeta de datos ya existe. Elija una de las siguientes: Remplazar Usar @@ -659,4 +658,5 @@ en los últimos 7 días. Salir de la sesión ¡No se encontró una aplicación con la cual establecer una imagen! Privacidad - + + diff --git a/src/main/res/values-es-rPE/strings.xml b/src/main/res/values-es-rPE/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rPE/strings.xml +++ b/src/main/res/values-es-rPE/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es-rPY/strings.xml b/src/main/res/values-es-rPY/strings.xml index 123109707f..a49546500f 100644 --- a/src/main/res/values-es-rPY/strings.xml +++ b/src/main/res/values-es-rPY/strings.xml @@ -8,5 +8,4 @@ Archivos - diff --git a/src/main/res/values-es-rUS/strings.xml b/src/main/res/values-es-rUS/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rUS/strings.xml +++ b/src/main/res/values-es-rUS/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es-rUY/strings.xml b/src/main/res/values-es-rUY/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rUY/strings.xml +++ b/src/main/res/values-es-rUY/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 46f3ac382c..67ba916236 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -418,7 +418,6 @@ ERROR: Fallo durante la migración ERROR: Fallo al actualizar el índice - La carpeta de datos ya existe. Escoge una de las opciones: Reemplazar Usar @@ -558,6 +557,10 @@ Versión a ser liberada La versión a ser liberada (release candidate - RC) es una instantánea de la próxima versión y se espera que sea estable. Probar su configuración individual podría ayudar a asegurar esto. Regístrate para probarla en Play Store o busca manualmente en la sección \"versiones\" de F-Droid. Colabore activamente + Únase a la conversación en IRC: <a href=\"%1$s\">#nextcloud-mobile</a> + Ayude a otros en el <a href=\"%1$s\">foro</a> + <a href=\"%1$s\">Traducen</a> la app + Revisa, corrige y escribe código, lee <a href=\"%1$s\">CONTRIBUTING.md</a> para más detalles Mover a… Copiar a… Elija carpeta… diff --git a/src/main/res/values-et-rEE/strings.xml b/src/main/res/values-et-rEE/strings.xml index 398f6e89ad..9342828b4b 100644 --- a/src/main/res/values-et-rEE/strings.xml +++ b/src/main/res/values-et-rEE/strings.xml @@ -273,7 +273,6 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi Viga: ei suutnud operatsiooni lõpetada Serveriga ühendumisel tekkis tõrge. - Sul ei ole %s õigusi selle faili ümbernimetamiseks diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml index 637746f19e..3de3a0aa2e 100644 --- a/src/main/res/values-fa/strings.xml +++ b/src/main/res/values-fa/strings.xml @@ -227,7 +227,6 @@ کپی کردن لینک کپی به کلیپ بورد تکمیل عملیات امکانپذیر نمی باشد، سرور در دسترس نمی باشد - شما دسترسی %s را ندارید برای تغییر نام این فایل برای حذف این فایل diff --git a/src/main/res/values-fr-rCA/strings.xml b/src/main/res/values-fr-rCA/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-fr-rCA/strings.xml +++ b/src/main/res/values-fr-rCA/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 6771263480..a379f868e5 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -417,7 +417,6 @@ ERREUR : Echec lors de la migration ERREUR : Echec lors de la mise à jour de l\'index - Le dossier de données existe déjà. Choisissez une des options suivantes : Remplacer Conserver le dossier actuel @@ -658,4 +657,5 @@ Se déconnecter Aucune application trouvée pour utiliser cette image ! Vie privée - + + diff --git a/src/main/res/values-fy-rNL/strings.xml b/src/main/res/values-fy-rNL/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-fy-rNL/strings.xml +++ b/src/main/res/values-fy-rNL/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 5e3ad5288a..e709211df7 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -254,7 +254,6 @@ Descárgueo de aquí: %2$s Produciuse un erro mentres agardaba polo servidor, a operación non se puido levar a fin Produciuse un erro mentres agardaba polo servidor, a operación non se puido levar a fin A operación non se completou, o servidor non está dispoñíbel - Non ten permisos %s para renomear este ficheiro para eliminar este ficheiro diff --git a/src/main/res/values-gu/strings.xml b/src/main/res/values-gu/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-gu/strings.xml +++ b/src/main/res/values-gu/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-hi-rIN/strings.xml b/src/main/res/values-hi-rIN/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-hi-rIN/strings.xml +++ b/src/main/res/values-hi-rIN/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-hi/strings.xml b/src/main/res/values-hi/strings.xml index fa5a01cf5c..dc916a52e7 100644 --- a/src/main/res/values-hi/strings.xml +++ b/src/main/res/values-hi/strings.xml @@ -31,7 +31,6 @@ त्रुटि विवरण भेजें - खाते विवरण diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml index 02575b009e..5056264435 100644 --- a/src/main/res/values-hr/strings.xml +++ b/src/main/res/values-hr/strings.xml @@ -59,7 +59,6 @@ Makni Detalji Pošaljite - Korisnićki računi Potrebna autentikacija Pogrešna lozinka diff --git a/src/main/res/values-hy/strings.xml b/src/main/res/values-hy/strings.xml index a1c0eb3f1b..fa28b808cf 100644 --- a/src/main/res/values-hy/strings.xml +++ b/src/main/res/values-hy/strings.xml @@ -71,7 +71,6 @@ 2012/05/18 12:23 PM Ուղարկել Պատճենել հղումը - Հաշիվներ Սխալ գաղտնաբառ Ընտրել diff --git a/src/main/res/values-ia/strings.xml b/src/main/res/values-ia/strings.xml index 9cb34946d1..b298b12d78 100644 --- a/src/main/res/values-ia/strings.xml +++ b/src/main/res/values-ia/strings.xml @@ -41,7 +41,6 @@ Nomine de dossier Error Incognite Invia - Contos Contrasigno errate Seliger diff --git a/src/main/res/values-io/strings.xml b/src/main/res/values-io/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-io/strings.xml +++ b/src/main/res/values-io/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-is/strings.xml b/src/main/res/values-is/strings.xml index 8abf238d2f..24362c6cfc 100644 --- a/src/main/res/values-is/strings.xml +++ b/src/main/res/values-is/strings.xml @@ -53,7 +53,7 @@ Virkja skráningu í annál Þetta er notað til að skrá vandamál Ferill annálsskráningar - Þetta sýnir skráningar í annála + Þetta sýnir skráningar í atvikaskrár Eyða ferli Samstilla dagatal & tengiliði Setja upp DAVdroid (v1.3.0+) fyrir þennan aðgang @@ -419,7 +419,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila. VILLA: Mistókst við yfirfærslu VILLA: Mistókst að uppfæra skráningarvísi - Gagnamappa er þegar til staðar. Veldu eitt af eftirtöldu: Skipta út Nota @@ -431,10 +430,10 @@ Smelltu hér til að fá þér einn frá þjónustuaðila. Sýsla með notandaaðganga Öruggri tengingu endurbeint í gegnum óörugga leið. - Annálar + Atvikaskrár Ferill sendinga Ekkert forrit fannst til að senda atvikaskrár. Settu upp tölvupóstforrit. - %1$s annálar Android-forrita + %1$s atvikaskrár Android-forrita Hleð inn gögnum … Auðkenningar krafist @@ -560,13 +559,13 @@ Smelltu hér til að fá þér einn frá þjónustuaðila. Tilkynna um vandamál á Github Hefurðu áhuga á að hjálpa til við að prófa næstu útgáfu? Prófaðu þróunarútgáfuna - Þetta innigeldur alla væntanlega eiginleika og er alveg á jaðrinum hvað varðar stöðugleika, Villur geta komið upp, og ef slíkt gerist, endilega tilkynntu um þær. + Þetta inniheldur alla væntanlega eiginleika og er alveg á jaðrinum hvað varðar stöðugleika. Villur geta komið upp, og ef slíkt gerist, endilega tilkynntu um þær. Forútgáfa Útgáfukandídat (RC) er stöðutaka á væntanlegri útgáfu og er vænst til að hún sé nokkuð stöðug. Með prófun á uppsetningunni þinni værirðu að hjálpa til við að tryggja þann stöðugleika. Skráðu þig til prófana í Play-safninu eða skoðaðu handvirkt í \"útgáfur\" hlutanum á F-Droid. Vertu virkur þáttakandi Taktu þátt í spjalli á IRC: <a href=\"%1$s\">#nextcloud-mobile</a> Hjálpaðu öðrum á <a href=\"%1$s\">spjallvefnum</a> - <a href=\"%1$s\">Þýða</a> forritið + <a href=\"%1$s\">Þýddu</a> forritið Yfirfarðu, bættu og skrifaðu kóða, skoðaðu <a href=\"%1$s\">CONTRIBUTING.md<a> fyrir nánari upplýsingar Færa í… Afrita í… @@ -660,4 +659,5 @@ Smelltu hér til að fá þér einn frá þjónustuaðila. Útskráning Engin forrit fundust til að setja mynd! Gagnaleynd - + + diff --git a/src/main/res/values-ja-rJP/strings.xml b/src/main/res/values-ja-rJP/strings.xml index aff2449b91..c72fb54e81 100644 --- a/src/main/res/values-ja-rJP/strings.xml +++ b/src/main/res/values-ja-rJP/strings.xml @@ -182,6 +182,7 @@ %1$d ファイルのコンテンツを同期できませんでした（%2$d の競合） 一部のローカルファイルが忘れられています %2$s フォルダー内の %1$d ファイルはコピーできませんでした。 + バージョン 1.3.16以降、このデバイスからアップロードされたファイルは、単独のファイルが複数のアカウントと同期する際にデータの損失を防ぐため、ローカルの%1$sフォルダーにコピーされます。 この変更により、このアプリの以前のバージョンでアップロードされたすべてのファイルは%2$sフォルダーにコピーされます。しかしながら、アカウント同期中にはエラーが発生してこの操作が完了しないようになっています。ファイルをこのままにして%3$sへのリンクを削除するか、あるいは%1$sフォルダーにファイルを移動して%4$sへのリンクを維持することができます。 以下のリストにあるのは、ローカルのファイル及びそれらにリンクしている %5$s内のリモートファイルです。 すべて移動 すべてのファイルを移動しました 一部のファイルは移動できませんでした @@ -436,6 +437,10 @@ 開発バージョンをテスト リリース候補 積極的な貢献 + IRCでチャットに参加してください: <a href=\"%1$s\">#nextcloud-mobile</a> + <a href=\"%1$s\">フォーラム</a> で他の人を助けてください + アプリを <a href=\"%1$s\">翻訳する</a> + 開発者として貢献には、 <a href=\"%1$s\">CONTRIBUTING.md</a> をご覧ください。 …に移動 …にコピー … フォルダーを選択 diff --git a/src/main/res/values-jv/strings.xml b/src/main/res/values-jv/strings.xml index 02aea080fd..28c53906dd 100644 --- a/src/main/res/values-jv/strings.xml +++ b/src/main/res/values-jv/strings.xml @@ -7,5 +7,4 @@ Njipuk - diff --git a/src/main/res/values-ka-rGE/strings.xml b/src/main/res/values-ka-rGE/strings.xml index 34ee785f82..43b52911f2 100644 --- a/src/main/res/values-ka-rGE/strings.xml +++ b/src/main/res/values-ka-rGE/strings.xml @@ -122,7 +122,6 @@ დატოვე ორივე გაგზავნა კოპირებულია კლიპბორდში - ანგარიში არჩევა დეტალური ინფორმაცია diff --git a/src/main/res/values-km/strings.xml b/src/main/res/values-km/strings.xml index f589185606..bffeaeb5a5 100644 --- a/src/main/res/values-km/strings.xml +++ b/src/main/res/values-km/strings.xml @@ -88,7 +88,6 @@ រហូតដល់ៈ ហត្ថលេខា: ផ្ញើ - គណនី ខុស​ពាក្យ​សម្ងាត់ ជ្រើស diff --git a/src/main/res/values-kn/strings.xml b/src/main/res/values-kn/strings.xml index 58047399a9..09c9cda4b3 100644 --- a/src/main/res/values-kn/strings.xml +++ b/src/main/res/values-kn/strings.xml @@ -32,7 +32,6 @@ ಮರುಹೆಸರಿಸು ತೆಗೆದುಹಾಕಿ ಕಳುಹಿಸಿ - ದೃಢೀಕರಣ ಅಗತ್ಯವಿದೆ ದುರ್ಬಲ ಗುಪ್ತಪದ ಆಯ್ಕೆ diff --git a/src/main/res/values-ku-rIQ/strings.xml b/src/main/res/values-ku-rIQ/strings.xml index 27ee50c468..8c1351031f 100644 --- a/src/main/res/values-ku-rIQ/strings.xml +++ b/src/main/res/values-ku-rIQ/strings.xml @@ -33,7 +33,6 @@ لابردن هه‌ڵه ناوی بوخچه - هەژمارەکان ناونیشانی ڕاژه بگەڕێ diff --git a/src/main/res/values-la/strings.xml b/src/main/res/values-la/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-la/strings.xml +++ b/src/main/res/values-la/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-lb/strings.xml b/src/main/res/values-lb/strings.xml index 3d0b8aa58d..ab05339ddf 100644 --- a/src/main/res/values-lb/strings.xml +++ b/src/main/res/values-lb/strings.xml @@ -242,7 +242,6 @@ Beim Waarden op de Server ass e Feeler opgetrueden, d\'Operatioun konnt net duerchgeféiert ginn Beim Waarden op de Server ass e Feeler opgetrueden, d\'Operatioun konnt net duerchgeféiert ginn D\'Operatioun konnt net ofgeschloss ginn, de Server ass net disponibel - Du hues keng Berechtegung %s fir dëse Fichier ëmzebenennen diff --git a/src/main/res/values-lo/strings.xml b/src/main/res/values-lo/strings.xml index 9866508df4..338c8c2762 100644 --- a/src/main/res/values-lo/strings.xml +++ b/src/main/res/values-lo/strings.xml @@ -8,6 +8,5 @@ On device--> ຂໍ້ຜິດພາດທີ່ບໍ່ຮູ້ສາເຫດ ຂໍ້ຜິດພາດທີ່ບໍ່ຮູ້ສາເຫດ - ການແບ່ງປັນ diff --git a/src/main/res/values-lt-rLT/strings.xml b/src/main/res/values-lt-rLT/strings.xml index f969a4cb91..8a10f973ad 100644 --- a/src/main/res/values-lt-rLT/strings.xml +++ b/src/main/res/values-lt-rLT/strings.xml @@ -256,7 +256,6 @@ Klaida prisijungiant prie serverio, operacija neįvykdyta Klaida prisijungiant prie serverio, operacija neįvykdyta Serveris nepasiekiamas, operacija negali būti atlikta - Neturite leidimo %s pervadinti failo diff --git a/src/main/res/values-mg/strings.xml b/src/main/res/values-mg/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-mg/strings.xml +++ b/src/main/res/values-mg/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-mk/strings.xml b/src/main/res/values-mk/strings.xml index 0d2dd06273..f6338b7955 100644 --- a/src/main/res/values-mk/strings.xml +++ b/src/main/res/values-mk/strings.xml @@ -235,7 +235,6 @@ Се случи грешка при чекање на на серверот, операцијата не можеше да се изврши Се случи грешка при чекање на на серверот, операцијата не можеше да се изврши Операцијата не можеше да заврши, серверот не е достапен - Немате дозвола %s да ја преименувате датотеката да ја избришете оваа датотека diff --git a/src/main/res/values-ml-rIN/strings.xml b/src/main/res/values-ml-rIN/strings.xml index a84b15a09b..196d2ce85a 100644 --- a/src/main/res/values-ml-rIN/strings.xml +++ b/src/main/res/values-ml-rIN/strings.xml @@ -8,5 +8,4 @@ ഫയലുകൾ - diff --git a/src/main/res/values-ml/strings.xml b/src/main/res/values-ml/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-ml/strings.xml +++ b/src/main/res/values-ml/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-mn/strings.xml b/src/main/res/values-mn/strings.xml index 8d80afeee4..1fab82e8ca 100644 --- a/src/main/res/values-mn/strings.xml +++ b/src/main/res/values-mn/strings.xml @@ -18,6 +18,5 @@ Аккаунт үүсгэх Одоогийн Устгах - Түгээлт diff --git a/src/main/res/values-mr/strings.xml b/src/main/res/values-mr/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-mr/strings.xml +++ b/src/main/res/values-mr/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-ms-rMY/strings.xml b/src/main/res/values-ms-rMY/strings.xml index efe192ad1d..6deb85457f 100644 --- a/src/main/res/values-ms-rMY/strings.xml +++ b/src/main/res/values-ms-rMY/strings.xml @@ -58,7 +58,6 @@ Buang Lokal sahaja Hantar - Akaun Alamat pelayan Cari diff --git a/src/main/res/values-mt-rMT/strings.xml b/src/main/res/values-mt-rMT/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-mt-rMT/strings.xml +++ b/src/main/res/values-mt-rMT/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-my/strings.xml b/src/main/res/values-my/strings.xml index 6f3b9bd571..06045df19e 100644 --- a/src/main/res/values-my/strings.xml +++ b/src/main/res/values-my/strings.xml @@ -17,7 +17,6 @@ မဟုတ်ဘူး အိုကေ ပယ်ဖျက်မည် - ရွေးချယ် သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည် ပြင်ဆင်နိုင် diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml index cd7e95acb4..9a30171f1b 100644 --- a/src/main/res/values-nb-rNO/strings.xml +++ b/src/main/res/values-nb-rNO/strings.xml @@ -418,7 +418,6 @@ FEIL: Under migrering FEIL: Under oppdatering av indeks - Datamappe finnes fra før, hva skal gjøres? Erstatt Bruk @@ -659,4 +658,5 @@ Utlogging Fant ikke noe program å sette bilder med. Personvern - + + diff --git a/src/main/res/values-ne/strings.xml b/src/main/res/values-ne/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-ne/strings.xml +++ b/src/main/res/values-ne/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index dfc4f652e9..f7163e6405 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -419,7 +419,6 @@ Kies er eentje van een provider. FOUT: Tijdens migratie FOUT: Tijdens bijwerken index - Gegevensmap bestaat al, wat te doen? Vervangen Gebruiken @@ -662,4 +661,5 @@ Kies er eentje van een provider. Uitloggen Geen app gevonden om afbeelding in te stellen Privacy - + + diff --git a/src/main/res/values-nn-rNO/strings.xml b/src/main/res/values-nn-rNO/strings.xml index 23c0672ce1..a7327b6bf0 100644 --- a/src/main/res/values-nn-rNO/strings.xml +++ b/src/main/res/values-nn-rNO/strings.xml @@ -126,7 +126,6 @@ Klarte ikkje å lagra sertifikatet Detaljar Send - Kontoar Loggar Feil passord diff --git a/src/main/res/values-oc/strings.xml b/src/main/res/values-oc/strings.xml index 4f4dea106d..6fc2b583e4 100644 --- a/src/main/res/values-oc/strings.xml +++ b/src/main/res/values-oc/strings.xml @@ -256,7 +256,6 @@ En rason d\'aquesta modificacion, totes los fichièrs mandats amb de versions an Una error s\'es produsida pendent l\'espèra del servidor. L\'operacion a pas pogut èsser efectuada Una error s\'es produsida pendent l\'espèra del servidor. L\'operacion a pas pogut èsser efectuada L\'operacion a pas pogut èsser acabada, lo servidor es pas disponible - Avètz pas la permission %s de renomenar aqueste fichièr d’escafar aqueste fichièr diff --git a/src/main/res/values-or-rIN/strings.xml b/src/main/res/values-or-rIN/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-or-rIN/strings.xml +++ b/src/main/res/values-or-rIN/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-pa/strings.xml b/src/main/res/values-pa/strings.xml index 1affca08de..7583c2ee53 100644 --- a/src/main/res/values-pa/strings.xml +++ b/src/main/res/values-pa/strings.xml @@ -103,7 +103,6 @@ ਦੋਵੇਂ ਰੱਖੋ ਚਿੱਤਰ ਝਲਕ ਭੇਜੋ - ਅਕਾਊਂਟ ਚੁਣੋ ਵੇਰਵ diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 4a5708a010..7aaa207e67 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -17,7 +17,7 @@ A - Z Z - A Najnowsze najpierw - Najstarsze najpier + Najstarsze najpierw Największe najpierw Najmniejsze najpierw @@ -42,7 +42,7 @@ Więcej Konta Zarządzaj kontami - Blokada hasłem + Blokada kodem PIN Blokada odciskiem palca Brak skonfigurowanych odcisków palców Pokaż ukryte pliki @@ -144,7 +144,7 @@ Anuluj synchronizację Anuluj Wróć - Zapisać + Zapisz Zapisz i wyjdź Błąd Wczytuję … @@ -211,16 +211,16 @@ Lokalnie: %1$s Zdalnie: %1$s Brak wystarczającego miejsca, aby skopiować wybrane pliki do folderu %1$s. Czy w zamian chcesz je tam przenieść? - Wymyśl kod PIN. + Podaj kod PIN - Wpisz kod PIN. - Kod PIN będzie wymagany przy każdym uruchomieniu aplikacji. - Wpisz kod PIN ponownie. - Usuń swój kod PIN. - Podane hasła nie są takie same. - Kod PIN nieprawidłowy. - Kod PIN został usunięty. - Kod PIN został zapisany. + Wymyśl kod PIN + Kod PIN będzie wymagany przy każdym uruchomieniu aplikacji + Wpisz kod PIN ponownie + Usuń swój kod PIN + Podane kody PIN nie są takie same + Kod PIN nieprawidłowy + Kod PIN został usunięty + Kod PIN został zapisany %1$s odtwarzacz muzyki %1$s (odtwarzany) @@ -399,7 +399,7 @@ do wysyłania do tego folderu Ten plik nie jest już dostępny na serwerze - Ścieżka przechowywania aktualizacji + Aktualizacja ścieżki przechowywania Koniec Przygotowywanie migracji… Sprawdzanie docelowe… @@ -417,12 +417,11 @@ BŁĄD: Nieudana migracja BŁĄD: Nieudana aktualizacja indeksu - Folder z danymi już istnieje. Wybierz jedną z następujących czynności: Zamień Użyj Nie można odczytać katalogu źródłowego! - Czy nadal chcesz zmienić ścieżkę do %1$s?\n\nUwaga: Wszystkie dane będą musiały zostać ponownie pobrane. + Czy nadal chcesz zmienić ścieżkę przechowywania na %1$s?\n\nUwaga: Wszystkie dane będą musiały zostać pobrane ponownie. Konta Dodaj konto @@ -608,12 +607,12 @@ Dostęp do, współdzielenie i ochrona twoich plików w domu i w pracy Wiele kont - Podłączenie się do wszystkich chmur + Podłączenie się do wszystkich swoich chmur Natychmiastowe wysyłanie Twoje zdjęcia będą bezpieczne - Pominąć + Pomiń Umieść palec na czytniku odcisku palca Nie rozpoznano odcisku palca @@ -658,5 +657,7 @@ Otrzymano nowe powiadomienie Wyloguj + Nie znaleziono aplikacji do ustawienia obrazu! Prywatność - + + diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index d4a9c2b540..995d593253 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -418,7 +418,6 @@ ERRO: Falha durante a migração ERRO: Falha ao atualizar índice - Pasta Data já existe. Escolha uma das seguintes: Substituir Usar @@ -659,4 +658,5 @@ Sair Nenhum aplicativo encontrado para atribuir uma imagem! Privacidade - + + diff --git a/src/main/res/values-rm/strings.xml b/src/main/res/values-rm/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-rm/strings.xml +++ b/src/main/res/values-rm/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 14a7fd939c..5359d16a24 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -420,7 +420,6 @@ ОШИБКА: Ошибка при миграции ОШИБКА: Ошибка при обновлении индекса - Каталог с данными уже существует. Выберите одно из действий: Перезаписать Использовать существующий @@ -663,4 +662,5 @@ Выйти Не надено приложения, с помощью которого можно установить изображение! Конфиденциальность - + + diff --git a/src/main/res/values-si-rLK/strings.xml b/src/main/res/values-si-rLK/strings.xml index 9c9bd43db5..c5861e8b10 100644 --- a/src/main/res/values-si-rLK/strings.xml +++ b/src/main/res/values-si-rLK/strings.xml @@ -73,7 +73,6 @@ නොසිතු ප්‍රශ්ණයක්; කරුණාකර වෙනත් යෙදුමක් භාවිතා කර ගොනුව තෝරන්න ගොනුවක් තෝරා නැත සඟවන්න - ගිණුම් තෝරන්න සේවාදායකයේ ලිපිනය diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 63fbabf57c..1eb12a4831 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -4,5 +4,4 @@ Všeobecné Stiahnuť Zrušiť - diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml index 5684eed659..b9b6cb3d15 100644 --- a/src/main/res/values-sq/strings.xml +++ b/src/main/res/values-sq/strings.xml @@ -418,7 +418,6 @@ në 7 ditët e fundit. GABIM: Gjatë migrimit GABIM: Gjatë përditësimit të indeksit - Folderi i të dhënave ekziston tashmë, cfarë të bëni? Mbishkruaj Përdor ekzistueset @@ -563,6 +562,10 @@ në 7 ditët e fundit. Lëshimi i kandidatit Lëshimi i kandidatit (RC) është një fragment i lëshimit të ardhshme dhe pritet të jetë i qëndrueshëm. Testimi i setup-it tuaj individuale mund të ndihmojë për ta siguruar këtë. Regjistrohuni për testimin në Play Store ose manualisht shikoni në seksionin \"versionet\" në F-Droid. Kontribim aktiv + Bashkohu në bisedat në IRC: <a href=\"%1$s\">#nextcloud-mobile</a> + Ndihmo të tjerët në <a href=\"%1$s\">forum</a> + <a href=\"%1$s\">Përktheni</a> aplikacionin + Kontriboni si një zhvillues, shih<a href=\"%1$s\">CONTRIBUTING.md</a> për detaje Levizni tek… Kopjojeni tek… Zgjidh dosjen… @@ -655,4 +658,5 @@ në 7 ditët e fundit. Dilni Nuk u gjet aplikacioni me të cilin vendoset foto! Privatësi - + + diff --git a/src/main/res/values-sr-rSP/strings.xml b/src/main/res/values-sr-rSP/strings.xml index 0b90b6adff..3620e5fdf3 100644 --- a/src/main/res/values-sr-rSP/strings.xml +++ b/src/main/res/values-sr-rSP/strings.xml @@ -66,7 +66,6 @@ Zadrži oboje Pošalji Kopirano u klipbord - Nalozi Izaberi Detaljnije diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 91a9b96a8f..16d0193be9 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -283,7 +283,6 @@ Критична грешка: не могу да радим Дошло је до грешке при повезивању са сервером. - Немате дозволу %s да преименујете овај фајл diff --git a/src/main/res/values-su/strings.xml b/src/main/res/values-su/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-su/strings.xml +++ b/src/main/res/values-su/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-sw-rKE/strings.xml b/src/main/res/values-sw-rKE/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-sw-rKE/strings.xml +++ b/src/main/res/values-sw-rKE/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-ta-rIN/strings.xml b/src/main/res/values-ta-rIN/strings.xml index 0f601d8306..3d361b3a12 100644 --- a/src/main/res/values-ta-rIN/strings.xml +++ b/src/main/res/values-ta-rIN/strings.xml @@ -29,7 +29,6 @@ பதிவேற்று விவரங்கள் அனுப்பவும் - கணக்குகள் விவரங்கள் diff --git a/src/main/res/values-ta-rLK/strings.xml b/src/main/res/values-ta-rLK/strings.xml index 5f6b266d4e..ff4d0534f1 100644 --- a/src/main/res/values-ta-rLK/strings.xml +++ b/src/main/res/values-ta-rLK/strings.xml @@ -108,7 +108,6 @@ நெறிமுறை இது ஒரு placeholder இரண்டையும் வைக்க - கணக்குகள் தெரிவுசெய்க விவரங்கள் diff --git a/src/main/res/values-te/strings.xml b/src/main/res/values-te/strings.xml index 74eaf1c824..3598130dbb 100644 --- a/src/main/res/values-te/strings.xml +++ b/src/main/res/values-te/strings.xml @@ -21,7 +21,6 @@ పొరపాటు సంచయం పేరు పంపించు - సేవకి చిరునామా తొలగించు diff --git a/src/main/res/values-tg-rTJ/strings.xml b/src/main/res/values-tg-rTJ/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-tg-rTJ/strings.xml +++ b/src/main/res/values-tg-rTJ/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-th-rTH/strings.xml b/src/main/res/values-th-rTH/strings.xml index a80ee581f3..36dd3735e4 100644 --- a/src/main/res/values-th-rTH/strings.xml +++ b/src/main/res/values-th-rTH/strings.xml @@ -298,7 +298,6 @@ ข้อผิดพลาด: ไม่สามารถดำเนินการได้ เกิดข้อผิดพลาดขณะกำลังเชื่อมต่อกับเซิร์ฟเวอร์ - คุณไม่ได้รับสิทธิ์ %s เพื่อเปลี่ยนชื่อไฟล์นี้ diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index b98a4e57a8..2c7e68c0f6 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -418,7 +418,6 @@ HATA: Aktarımda sorun çıktı HATA: Dizin güncellenirken sorun çıktı - Veri klasörü zaten var, yapılacak işlemi seçin: Değiştirilsin Kullanılsın @@ -659,4 +658,5 @@ Oturumu Kapat Görselin ayarlanabileceği bir uygulama bulunamadı! Gizlilik - + + diff --git a/src/main/res/values-ug/strings.xml b/src/main/res/values-ug/strings.xml index 9d8f200105..3344d33741 100644 --- a/src/main/res/values-ug/strings.xml +++ b/src/main/res/values-ug/strings.xml @@ -45,7 +45,6 @@ ئات ئۆزگەرت چىقىرىۋەت يوللا - ھېساباتلار مۇلازىمېتىر ئادرىسى ھەمبەھىر diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index c81545a145..30d65c58d1 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -272,7 +272,6 @@ Під час очікування на сервер виникла помилка, операцію неможливо завершити Під час очікування на сервер виникла помилка, операцію неможливо завершити Неможливо завершити операцію, сервер недоступний - У вас немає повноважень %s на перейменування цього файла diff --git a/src/main/res/values-ur-rPK/strings.xml b/src/main/res/values-ur-rPK/strings.xml index 977fb30bc6..fe3ac15b0b 100644 --- a/src/main/res/values-ur-rPK/strings.xml +++ b/src/main/res/values-ur-rPK/strings.xml @@ -25,7 +25,6 @@ غیر معروف خرابی غیر معروف خرابی بھجیں - منتخب کریں اشتراک لنک تاریخ معیاد سیٹ کریں diff --git a/src/main/res/values-ur/strings.xml b/src/main/res/values-ur/strings.xml index 63dbc495ac..141427dbe5 100644 --- a/src/main/res/values-ur/strings.xml +++ b/src/main/res/values-ur/strings.xml @@ -1,5 +1,4 @@ خرابی - diff --git a/src/main/res/values-uz/strings.xml b/src/main/res/values-uz/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-uz/strings.xml +++ b/src/main/res/values-uz/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index e456b1f05f..f65e8ffc8c 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -187,7 +187,6 @@ Một lỗi đã xảy ra khi thử chia sẻ file hoặc thư mục này Một lỗi đã xảy ra khi thử gỡ chia sẻ file hoặc thư mục này Gởi - Tài khoản Chọn Chi tiết diff --git a/src/main/res/values-yo/strings.xml b/src/main/res/values-yo/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-yo/strings.xml +++ b/src/main/res/values-yo/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index b49324d3c5..1c6a0e0065 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -421,7 +421,6 @@ 错误：迁移过程中失败 错误：无法更新索引 - 数据文件夹已经存在。 选择以下选项之一： 代替 使用 @@ -661,4 +660,5 @@ 退出 没有应用程序发现设置图片！ 隐私 - + + diff --git a/src/main/res/values-zh-rHK/strings.xml b/src/main/res/values-zh-rHK/strings.xml index 888175d952..e8d12f5fba 100644 --- a/src/main/res/values-zh-rHK/strings.xml +++ b/src/main/res/values-zh-rHK/strings.xml @@ -67,7 +67,6 @@ 12:23:45 發送 複製連結 - 帳號 密碼錯誤 伺服器地址 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index df530ace28..95e6d8a75c 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -419,7 +419,7 @@ ERROR: Failed during migration ERROR: Failed to updating index - Data folder exists already. Choose one of the folowing: + Data folder exists already. Choose one of the following: Replace Use @@ -667,4 +667,6 @@ Logout No app found to set a picture with! Privacy + + diff --git a/src/modified/AndroidManifest.xml b/src/modified/AndroidManifest.xml index 7ae4b337d0..0a0f8fcc7c 100644 --- a/src/modified/AndroidManifest.xml +++ b/src/modified/AndroidManifest.xml @@ -19,8 +19,8 @@ + android:versionCode="10040399" + android:versionName="1.4.3">