From: David A. Velasco Date: Wed, 3 Dec 2014 10:31:49 +0000 (+0100) Subject: Merge branch 'master' into develop X-Git-Tag: oc-android-1.7.0_signed~89 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/50e39f044f0ac1bbd572ba9eb8178a415791a8a5?hp=bad9f3011590d2f6b634833e3ef9e78a8fa0a96e Merge branch 'master' into develop --- diff --git a/.gitignore b/.gitignore index 9b9bd8e3..8346dbfc 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,8 @@ # generated files bin/ +build/ +*.iml gen/ target/ @@ -30,5 +32,11 @@ oc_framework/proguard-project.txt oc_framework-test-project/proguard-project.txt tests/proguard-project.txt -# Should not be commited inside this repo: -actionbarsherlock/ \ No newline at end of file +# Android Studio and Gradle specific entries +.gradle +.idea +*.iml +build + +# Actionbarsherlock is now ignored since scripts takes care of init the sub-modules. +actionbarsherlock \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index f0ca8721..fa52fcd6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,5 @@ -[submodule "actionbarsherlock"] - path = actionbarsherlock - url = git://github.com/JakeWharton/ActionBarSherlock.git + [submodule "owncloud-android-library"] path = owncloud-android-library url = git://github.com/owncloud/android-library.git + branch = develop diff --git a/.travis.yml b/.travis.yml index 50b73d1b..d7e46cbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,14 @@ language: android android: components: + - platform-tools + - tools - build-tools-20.0.0 - android-19 - - android-17 - - android-14 - - extra-android-support - licenses: - - 'android-sdk-license-5be876d5' - - 'android-sdk-license-598b93a6' - -jdk: oraclejdk7 - before_install: - rm pom.xml - - ./setup_env.sh - script: + - ./setup_env.sh ant - ant clean - ant debug diff --git a/SETUP.md b/SETUP.md index 39539038..a9e2a93b 100644 --- a/SETUP.md +++ b/SETUP.md @@ -1,13 +1,11 @@ - + If you want to start help developing ownCloud please follow the [contribution guidelines][0] and observe these instructions. If you have any problems, start again with 1) and work your way down. If something still does not work as described here, please open a new issue describing exactly what you did, what happened, and what should have happened. - -### 1) Fork and download android/develop repository: -NOTE: Android SDK with platforms 8, 14 and 19 (and maybe others) need to be installed. - You must have the Android SDK 'tools/', and 'platforms-tools/' folders in your environment path variable. - "git" need to be installed and in your environment path variable. +### 1. Fork and download android/develop repository: + +NOTE: You must have git in your environment path variable to perform the next operations. * Navigate to https://github.com/owncloud/android, click fork. * Clone your new repo: "git clone git@github.com:YOURGITHUBNAME/android.git" @@ -16,23 +14,28 @@ NOTE: Android SDK with platforms 8, 14 and 19 (and maybe others) need to be inst * Pull changes from your develop branch: "git pull origin develop" * Make official ownCloud repo known as upstream: "git remote add upstream git@github.com:owncloud/android.git" * Make sure to get the latest changes from official android/develop branch: "git pull upstream develop" -* Complete the setup of project properties and resolve pending dependencies running "setup_env.bat" or "./setup_env.sh" . -At this point you can continue using different tools to build the project. Sections 2a), 2b), and 2c) describe some of the existing alternatives. +At this point you can continue using different tools to build the project. Section 2, 3, 4, 5 and 6 describe some of the existing alternatives. + +### 2. Building with Ant: -### 2a) Building with Ant: - NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in your environment path variable. -* Run "ant clean" . +* Resolve necessary dependencies running: + - Windows: "setup_env.bat ant" + - Mac OS/Linux: "./setup_env.sh ant" +* Run "ant clean". * Run "ant debug" to generate a debuggable version of the ownCloud app. -### 2b) Building with console/maven: +### 3. Building with console/maven: NOTE: You must have mvn (version >= 3.1.1) in your environment path. Current Android 'platforms-tools' need to be installed. -Download/install Android plugin for Maven, install owncloud-android-library, then build ownCloud with mvn: +Download/install Android plugin for Maven, then build ownCloud with mvn: +* Resolve necessary dependencies running: + - Windows: "setup_env.bat maven" + - Mac OS/Linux: "./setup_env.sh maven" * cd .. * git clone https://github.com/mosabua/maven-android-sdk-deployer.git * cd maven-android-sdk-deployer @@ -41,43 +44,65 @@ Download/install Android plugin for Maven, install owncloud-android-library, the * mvn install * cd .. -Now you can create ownCloud APK using "mvn package" +Now you can create ownCloud APK using "mvn package" and find it as ownCloud.apk under the target + +### 4. Building with Gradle: -### 2c) Building with Eclipse: +* Complete the setup of project properties running: + - Windows: "setup_env.bat gradle" + - Mac OS/Linux: "./setup_env.sh gradle" +* Open a terminal and go to the "android" directory that contains the repository. +* Run the 'clean' and 'build' tasks using the Gradle wrapper provided: + - Windows: gradlew.bat clean build + - Mac OS/Linux: ./gradlew clean build +* You can find the generated apk file in android/build/outputs/apk + +### 5. Building with Eclipse: NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in your environment path variable. -* Complete the setup of project properties and resolve pending dependencies running "setup_env.bat" or "./setup_env.sh" . -* Open Eclipse and create new "Android Project from Existing Code". Choose android/actionbarsherlock/library as root. +* Resolve necessary dependencies running: + - Windows: "setup_env.bat ant" + - Mac OS/Linux: "./setup_env.sh ant" + * Open Eclipse and create new "Android Project from Existing Code". Choose android/actionbarsherlock/library as root. * Clean project and compile. -* If any error appear, check the project properties; in the 'Android' section, API Level should be greater or equal than 14. -* If "error loading libz.so.1" appears, try "sudo apt-get install lib32z1" +* If any error appears, check the project properties; in the 'Android' section, API Level should be greater or equal than 14. * Make sure android/actionbarsherlock/library/bin/library.jar was created. -* Create a new "Android Project from Existing Code". Choose android/owncloud-android-library as root. (test and sample clients are not required.) +* Create a new "Android Project from Existing Code". Choose android/owncloud-android-library as root. * Clean project and compile. -* If any error appear, check the project properties; in the 'Android' section, API Level should be 19 or greater. -* Make sure 'android/owncloud-android-library/bin/owncloud android library.jar' was created. +* If any error appears, check the project properties; in the 'Android' section, API Level should be 19 or greater. +* Make sure android/owncloud-android-library/bin/classes.jar was created. * Import ownCloud Android project. * Clean project and compile. * If any error appears, check the project properties of owncloud-android project; in the 'Android' section: - - API Level should be 19 or greater. - - Two library projects should appear referred in the bottom square: actionbarsherlock/library and owncloud-android-library. Add them if needed. + - API Level should be 19 or greater. + - Two library projects should appear referred in the bottom square: actionbarsherlock/library and owncloud-android-library. Add them if needed. * After those actions you should be good to go. HAVE FUN! NOTE: Even though API level is set to 19, APK also runs on older devices because in AndroidManifest.xml minSdkVersion is set to 8. -### 3) Create pull request: - +### 6. Building with Android Studio: + +* Complete the setup of project properties running: + - Windows: "setup_env.bat gradle" + - Mac OS/Linux: "./setup_env.sh gradle" +* The first time you want to open the project in Android Studio, select 'Import Project...' and choose the file "android/settings.gradle". + Android Studio will then create the '.iml' files it needs. If you ever close the project but the files are still there, you just select + 'Open Project...'. The file chooser will show an Android face as the folder icon, which you can select to reopen the project. +* To build the project, follow the guidelines shown on [4. Building with Gradle][2]. + +### 7. Create pull request: + NOTE: You must sign the [Contributor Agreement][1] before your changes can be accepted! * Commit your changes locally: "git commit -a" -* Push your changes to your Github repo: "git push" +* Push your changes to your GitHub repo: "git push" * Browse to https://github.com/YOURGITHUBNAME/android/pulls and issue pull request * Click "Edit" and set "base:develop" * Again, click "Edit" and set "compare:develop" * Enter description and send pull request. -### 4) Create another pull request: +### 8. Create another pull request: To make sure your new pull request does not contain commits which are already contained in previous PRs, create a new branch which is a clone of upstream/develop. @@ -85,8 +110,9 @@ To make sure your new pull request does not contain commits which are already co * git checkout -b my_new_develop_branch upstream/develop * If you want to rename that branch later: "git checkout -b my_new_develop_branch_with_new_name" * Push branch to server: "git push -u origin name_of_local_develop_branch" -* Use Github to issue PR +* Use GitHub to issue PR [0]: https://github.com/owncloud/android/blob/master/CONTRIBUTING.md [1]: http://owncloud.org/about/contributor-agreement/ +[2]: https://github.com/owncloud/android/blob/master/SETUP.md#4-building-with-gradle diff --git a/actionbarsherlock b/actionbarsherlock deleted file mode 160000 index 9598f2bb..00000000 --- a/actionbarsherlock +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9598f2bb2ceed4a834cd5586a903f270ca4c0ccc diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..46308aca --- /dev/null +++ b/build.gradle @@ -0,0 +1,78 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.14.0' + } +} + +apply plugin: 'com.android.application' + + +repositories { + mavenCentral() + + flatDir { + dirs 'libs' + } +} + +artifacts.add("default", file('libs/actionbarsherlock.aar')) + +dependencies { + compile name: 'touch-image-view' + compile 'com.android.support:support-v4:19.1.0' + compile project('libs/actionbarsherlock_lib') + compile project(':owncloud-android-library') + compile 'com.jakewharton:disklrucache:2.0.2' +} + +android { + compileSdkVersion 19 + buildToolsVersion "20.0.0" + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['res'] + } + + // Move the tests to tests/java, tests/res, etc... + instrumentTest.setRoot('tests') + + // Move the build types to build-types/ + // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... + // This moves them out of them default location under src//... which would + // conflict with src/ being used by the main source set. + // Adding new build types or product flavors should be accompanied + // by a similar customization. + debug.setRoot('build-types/debug') + release.setRoot('build-types/release') + } + + android { + lintOptions { + abortOnError false + } + } + + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + productFlavors { + } + + packagingOptions { + exclude 'META-INF/LICENSE.txt' + } +} + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..3d0dee6e Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..8d63f892 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Oct 15 10:45:44 CEST 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..91a7e269 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..aec99730 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/libs/actionbarsherlock_lib/build.gradle b/libs/actionbarsherlock_lib/build.gradle new file mode 100644 index 00000000..58172e2c --- /dev/null +++ b/libs/actionbarsherlock_lib/build.gradle @@ -0,0 +1,2 @@ +configurations.create("default") +artifacts.add("default", file('library-4.1.0.aar')) diff --git a/libs/actionbarsherlock_lib/library-4.1.0.aar b/libs/actionbarsherlock_lib/library-4.1.0.aar new file mode 100644 index 00000000..f340e011 Binary files /dev/null and b/libs/actionbarsherlock_lib/library-4.1.0.aar differ diff --git a/oc_jb_workaround/build.gradle b/oc_jb_workaround/build.gradle new file mode 100644 index 00000000..882a090f --- /dev/null +++ b/oc_jb_workaround/build.gradle @@ -0,0 +1,42 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.13.0' + } +} +apply plugin: 'com.android.library' + +dependencies { + compile fileTree(dir: 'libs', include: '*.jar') +} + +android { + compileSdkVersion 19 + buildToolsVersion "20.0.0" + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + + // Move the tests to tests/java, tests/res, etc... + instrumentTest.setRoot('tests') + + // Move the build types to build-types/ + // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... + // This moves them out of them default location under src//... which would + // conflict with src/ being used by the main source set. + // Adding new build types or product flavors should be accompanied + // by a similar customization. + debug.setRoot('build-types/debug') + release.setRoot('build-types/release') + } +} diff --git a/oc_jb_workaround/gradle/wrapper/gradle-wrapper.jar b/oc_jb_workaround/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..8c0fb64a Binary files /dev/null and b/oc_jb_workaround/gradle/wrapper/gradle-wrapper.jar differ diff --git a/oc_jb_workaround/gradle/wrapper/gradle-wrapper.properties b/oc_jb_workaround/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..1e61d1fd --- /dev/null +++ b/oc_jb_workaround/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/oc_jb_workaround/gradlew b/oc_jb_workaround/gradlew new file mode 100755 index 00000000..91a7e269 --- /dev/null +++ b/oc_jb_workaround/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/oc_jb_workaround/gradlew.bat b/oc_jb_workaround/gradlew.bat new file mode 100644 index 00000000..aec99730 --- /dev/null +++ b/oc_jb_workaround/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/oc_jb_workaround/project.properties b/oc_jb_workaround/project.properties index a3ee5ab6..4ab12569 100644 --- a/oc_jb_workaround/project.properties +++ b/oc_jb_workaround/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-17 +target=android-19 diff --git a/owncloud-android-library b/owncloud-android-library index 0030d82e..8261865f 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit 0030d82ee8156eb82224eaea810e4bf6010feef1 +Subproject commit 8261865ff24c1bfc05be19ae9364a66dac8f26c3 diff --git a/pom.xml b/pom.xml index 6a8cf6a7..538df03c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 com.owncloud.android @@ -13,7 +14,7 @@ 1.5.1-SNAPSHOT 1.6 - 4.4.2_r3 + 4.4.2_r4 19 4.2.0 @@ -26,8 +27,17 @@ scm:git:git@github.com:owncloud/android.git https://github.com/owncloud/android - + + + + + + + + + + touch-image-view.jar @@ -44,6 +54,13 @@ 19.1.0 --> + + + com.jakewharton + disklrucache + 2.0.2 + + android-support-v4.jar android-support-v4.jar @@ -51,34 +68,35 @@ system ${basedir}/third_party/android-support-library/android-support-v4.jar - - - android - android - ${google.android-version} - provided - + com.actionbarsherlock - actionbarsherlock + library ${actionbarsherlock-version} - provided + apklib - com.actionbarsherlock - actionbarsherlock - ${actionbarsherlock-version} - apklib + android + android + ${google.android-version} + provided + + + + + + + - com.owncloud.android - owncloud-android-library - ${owncloud.version} - + com.owncloud.android + owncloud-android-library + ${owncloud.version} + @@ -92,7 +110,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.0 + 3.1 ${java-version} ${java-version} @@ -102,7 +120,7 @@ com.jayway.maven.plugins.android.generation2 android-maven-plugin - 3.8.0 + 3.8.2 ${env.ANDROID_HOME} diff --git a/res/layout/list_footer.xml b/res/layout/list_footer.xml new file mode 100644 index 00000000..a49874d6 --- /dev/null +++ b/res/layout/list_footer.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml index 4236d070..160edc1d 100644 --- a/res/layout/list_fragment.xml +++ b/res/layout/list_fragment.xml @@ -25,16 +25,18 @@ - + android:layout_height="match_parent" + android:layout_weight="1" + android:footerDividersEnabled="false" > + - + - - sekondes gelede OK Kanseleer + Fout Kies diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 90c7ba74..66c7c47f 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -178,7 +178,7 @@ Ci-dessous la liste des fichiers locaux, et les fichiers distants dans %5$s auxq Nom d\'utilisateur ou mot de passe incorrect Échec d\'autorisation Accès refusé par le serveur d\'autorisation - État inattendu ; veuillez entrer à nouveau l\'URL du serveur + État inattendu ; veuillez saisir à nouveau l\'URL du serveur Votre autorisation a expiré. Merci de vous authentifier à nouveau Veuillez saisir le mot de passe courant Votre session a expiré. Merci de vous reconnecter diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 5bb79824..b5dc46b4 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -279,7 +279,7 @@ Registri Invia cronologia Registri applicazione ownCloud Android - Caricamento dati... + Caricamento dati in corso... Autenticazione richiesta Password errata Sposta diff --git a/res/values-sk-rSK/strings.xml b/res/values-sk-rSK/strings.xml index 8616f683..3946e28b 100644 --- a/res/values-sk-rSK/strings.xml +++ b/res/values-sk-rSK/strings.xml @@ -11,6 +11,12 @@ Nastavenia Podrobnosti OdoslaÅ¥ + ZoradiÅ¥ + ZoradiÅ¥ podľa + + A-Z + NajnovÅ¡ie - NajstarÅ¡ie + VÅ¡eobecné @@ -32,7 +38,10 @@ DoporučiÅ¥ známemu Spätná väzba Podmienky používania + ZapamätaÅ¥ umiestnenie zdieľania + ZapamätaÅ¥ posledné umiestnenie pre nahranie zdieľaných súborov Skúste %1$s na vaÅ¡om telefóne! + Chcel by som vám odporučiÅ¥ %1$s na vaÅ¡om smartfóne!\nSÅ¥ahujte tu: %2$s SkontrolovaÅ¥ Server Adresa servera https://... Používateľské meno @@ -106,6 +115,7 @@ Obsah %1$d súborov nemohol byÅ¥ synchronizovaný (%2$d konfliktov) Niektoré lokálne súbory boli zabudnuté %1$d súborov z %2$s priečinkov sa nepodarilo skopírovaÅ¥ do + Od verzie 1.3.16 sú súbory nahrané z tohoto zariadenia kopírované do lokálneho priečinka %1$s, aby sa zabránilo strate dát pri synchronizácii jedného súboru s viacerými účtami.\n\nVÅ¡etky súbory nahraté predchádzajúcimi verziami aplikácie boli z tohoto dôvodu prekopírované do priečinka %2$s. Bohužiaľ sa objavila chyba zabraňujúca dokončeniu tejto operácie v priebehu synchronizácie účtu. Buď môžete súbor(y) ponechaÅ¥ ako sú a odobraÅ¥ odkaz z priečinka %3$s, alebo presunúť súbor(y) do priečinka %1$s a zachovaÅ¥ odkaz na %4$s.\n\nNižšie je uvedený lokálny súbor(y) a vzdialený súbor(y) v %5$s, s ktorým je prepojený. Priečinok %1$s už existuje PremiestniÅ¥ vÅ¡etko VÅ¡etky súbory boli premiestnené @@ -239,9 +249,12 @@ Ukážka obrazu Obrázok nemožno zobraziÅ¥ %1$s nemožno skopírovaÅ¥ do lokálneho priečinka %2$s + Cesta pre nahrávanie Je nám to ľúto, ale zdieľanie nie je na vaÅ¡om serveri povolené. Prosím kontaktujte vášho administrátora. + Nemožno zdieľaÅ¥. Skontrolujte, či súbor existuje Pri pokuse o zdieľanie tohto súboru alebo priečinka doÅ¡lo k chybe + Nemožno ukončiÅ¥ zdieľanie. Skontrolujte, či súbor existuje Pri pokuse zruÅ¡iÅ¥ zdieľanie tohto súboru alebo priečinka doÅ¡lo k chybe OdoslaÅ¥ Kopíruj odkaz @@ -262,9 +275,21 @@ Súbor už na serveri nie je dostupný Účty PridaÅ¥ účet + Zabezpečené pripojenie je presmerované na nezabezpečenú trasu. + Logy + OdoslaÅ¥ históriu + Logy aplikácie ownCloud pre Android + Nahrávam dáta... Vyžaduje sa overenie Nesprávne heslo Presunúť + Nič tu nie je. Pridajte priečinok! VybraÅ¥ + Nemožno presunúť. Skontrolujte, či súbor existuje + Priečinok nemožno presunúť do vlastného podpriečinka + Súbor už v cieľovom priečinku existuje + Pri pokuse o presun tohoto súboru alebo priečinka nastala chyba + pre presun tohoto súboru + Okamžité nahratie Zabezpečenie diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index a794c6d9..6a79dc75 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -32,6 +32,7 @@ Krijuar: Modifikuar: Shkarko + Ndaje lidhjen Po Jo Ok diff --git a/res/values/strings.xml b/res/values/strings.xml index d6b54574..8b828682 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -66,6 +66,10 @@ Nothing in here. Upload something! Loading... There are no files in this folder. + folder + folders + file + files Tap on a file to display additional information. Size: Type: diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..66022f5e --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +include ':owncloud-android-library' +include 'libs/actionbarsherlock_lib' +include ':' diff --git a/setup_env.bat b/setup_env.bat index dc44a120..0781036c 100644 --- a/setup_env.bat +++ b/setup_env.bat @@ -1,8 +1,59 @@ +@echo off + +:: Use argument to decide which build system should be used +if "%1" == "gradle" goto initForGradle +if "%1" == "maven" goto initForMaven +if "%1" == "ant" goto initForAnt +goto invalidInput + +:initForGradle +echo "Executing Gradle setup..." +goto initDefault + +:initForMaven +echo "Executing Maven setup..." +goto initDefault + +:initForAnt +echo "Executing Ant setup..." +::If the directory exists the script has already been executed +if not exist .\actionbarsherlock ( + + ::Gets the owncloud-android-library + call git submodule init + call git submodule update + + ::Clones the actionbarsherlock and checks-out the right release (4.2.0) + git clone "https://github.com/JakeWharton/ActionBarSherlock.git" "actionbarsherlock" + cd "actionbarsherlock" + git checkout "90939dc3925ffaaa0de269bbbe1b35e274968ea1" + cd ../ + + call android.bat update project -p actionbarsherlock/library -n ActionBarSherlock --target android-19 + call android.bat update lib-project -p owncloud-android-library + call android.bat update project -p . + call android.bat update project -p oc_jb_workaround + copy /Y third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar + call android.bat update test-project -p tests -m .. +) +goto complete + +:initDefault call git submodule init call git submodule update -call android.bat update project -p actionbarsherlock\library -n ActionBarSherlock call android.bat update lib-project -p owncloud-android-library call android.bat update project -p . call android.bat update project -p oc_jb_workaround -copy /Y third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar call android.bat update test-project -p tests -m .. +goto complete + +:invalidInput +echo "Input argument invalid." +echo "Usage: %0 [ant | maven | gradle]." +goto exit + +:complete +echo "...setup complete." +goto exit + +:exit \ No newline at end of file diff --git a/setup_env.sh b/setup_env.sh index ae421423..8c9af071 100755 --- a/setup_env.sh +++ b/setup_env.sh @@ -1,10 +1,75 @@ #!/bin/bash -e -git submodule init -git submodule update -android update project -p actionbarsherlock/library -n ActionBarSherlock -android update lib-project -p owncloud-android-library -android update project -p . -android update project -p oc_jb_workaround -cp third_party/android-support-library/android-support-v4.jar actionbarsherlock/library/libs/android-support-v4.jar -android update test-project -p tests -m .. + +#Repository +ActionBarSherlockRepo="https://github.com/JakeWharton/ActionBarSherlock.git" + +#Directory for actionbarsherlock +DIRECTORY="actionbarsherlock" + +#Commit for version 4.2 of actionbar sherlock +COMMIT="90939dc3925ffaaa0de269bbbe1b35e274968ea1" + + +function initDefault { + git submodule init + git submodule update + android update lib-project -p owncloud-android-library + android update project -p . + android update project -p oc_jb_workaround + android update test-project -p tests -m .. +} + +function initForAnt { + #If the directory exists the script has already been executed + if [ ! -d "$DIRECTORY" ]; then + + #Gets the owncloud-android-library + git submodule init + git submodule update + + #Clones the actionbarsherlock and checks-out the right release (4.2.0) + git clone $ActionBarSherlockRepo $DIRECTORY + cd $DIRECTORY + git checkout $COMMIT + cd ../ + + #As default it updates the ant scripts + android update project -p "$DIRECTORY"/library -n ActionBarSherlock --target android-19 + android update lib-project -p owncloud-android-library + android update project -p . + android update project -p oc_jb_workaround + cp third_party/android-support-library/android-support-v4.jar actionbarsherlock/library/libs/android-support-v4.jar + android update test-project -p tests -m .. + fi +} + +#No args +if [ $# -lt 1 ]; then + echo "No args found" + echo "Usage : $0 [gradle | maven | ant]" + exit +fi + +#checking args +case "$1" in + + "ant") + echo "Creating Ant environment" + initForAnt + ;; + + "gradle") echo "Creating gradle environment" + initDefault + ;; + + "maven") echo "Creating maven environment" + initDefault + ;; + + *) echo "Argument not recognized" + echo "Usage : $0 [gradle | maven | ant]" + ;; +esac + +exit diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java index 41a51063..d8030642 100644 --- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Iterator; +import java.util.List; import java.util.Vector; import com.owncloud.android.MainApp; @@ -33,7 +34,6 @@ import com.owncloud.android.lib.resources.shares.ShareType; import com.owncloud.android.lib.resources.files.FileUtils; import com.owncloud.android.utils.FileStorageUtils; - import android.accounts.Account; import android.content.ContentProviderClient; import android.content.ContentProviderOperation; @@ -41,6 +41,7 @@ import android.content.ContentProviderResult; import android.content.ContentResolver; import android.content.ContentUris; import android.content.ContentValues; +import android.content.Intent; import android.content.OperationApplicationException; import android.database.Cursor; import android.net.Uri; @@ -346,7 +347,9 @@ public class FileDataStorageManager { ).withSelection(where, whereArgs).build()); if (file.isDown()) { - new File(file.getStoragePath()).delete(); + String path = file.getStoragePath(); + new File(path).delete(); + triggerMediaScan(path); // notify MediaScanner about removed file } } } @@ -484,8 +487,12 @@ public class FileDataStorageManager { } success &= (deleted > 0); } - if (removeLocalCopy && file.isDown() && file.getStoragePath() != null && success) { - success = new File(file.getStoragePath()).delete(); + String localPath = file.getStoragePath(); + if (removeLocalCopy && file.isDown() && localPath != null && success) { + success = new File(localPath).delete(); + if (success) { + triggerMediaScan(localPath); + } if (!removeDBData && success) { // maybe unnecessary, but should be checked TODO remove if unnecessary file.setStoragePath(null); @@ -542,11 +549,13 @@ public class FileDataStorageManager { success &= removeLocalFolder(file); } else { if (file.isDown()) { + String path = file.getStoragePath(); File localFile = new File(file.getStoragePath()); success &= localFile.delete(); if (success) { file.setStoragePath(null); saveFile(file); + triggerMediaScan(path); // notify MediaScanner about removed file } } } @@ -568,7 +577,9 @@ public class FileDataStorageManager { if (localFile.isDirectory()) { success &= removeLocalFolder(localFile); } else { + String path = localFile.getAbsolutePath(); success &= localFile.delete(); + triggerMediaScan(path); // notify MediaScanner about removed file } } } @@ -576,109 +587,20 @@ public class FileDataStorageManager { return success; } + /** - * Updates database for a folder that was moved to a different location. + * Updates database and file system for a file or folder that was moved to a different location. * * TODO explore better (faster) implementations * TODO throw exceptions up ! */ - public void moveFolder(OCFile folder, String newPath) { - // TODO check newPath - - if ( folder != null && folder.isFolder() && - folder.fileExists() && !OCFile.ROOT_PATH.equals(folder.getFileName()) - ) { - /// 1. get all the descendants of 'dir' in a single QUERY (including 'dir') - Cursor c = null; - if (getContentProviderClient() != null) { - try { - c = getContentProviderClient().query ( - ProviderTableMeta.CONTENT_URI, - null, - ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " + - ProviderTableMeta.FILE_PATH + " LIKE ? ", - new String[] { mAccount.name, folder.getRemotePath() + "%" }, - ProviderTableMeta.FILE_PATH + " ASC " - ); - } catch (RemoteException e) { - Log_OC.e(TAG, e.getMessage()); - } - } else { - c = getContentResolver().query ( - ProviderTableMeta.CONTENT_URI, - null, - ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " + - ProviderTableMeta.FILE_PATH + " LIKE ? ", - new String[] { mAccount.name, folder.getRemotePath() + "%" }, - ProviderTableMeta.FILE_PATH + " ASC " - ); - } - - /// 2. prepare a batch of update operations to change all the descendants - ArrayList operations = - new ArrayList(c.getCount()); - int lengthOfOldPath = folder.getRemotePath().length(); - String defaultSavePath = FileStorageUtils.getSavePath(mAccount.name); - int lengthOfOldStoragePath = defaultSavePath.length() + lengthOfOldPath; - if (c.moveToFirst()) { - do { - ContentValues cv = new ContentValues(); // keep the constructor in the loop - OCFile child = createFileInstance(c); - cv.put( - ProviderTableMeta.FILE_PATH, - newPath + child.getRemotePath().substring(lengthOfOldPath) - ); - if ( child.getStoragePath() != null && - child.getStoragePath().startsWith(defaultSavePath) ) { - cv.put( - ProviderTableMeta.FILE_STORAGE_PATH, - defaultSavePath + newPath + - child.getStoragePath().substring(lengthOfOldStoragePath) - ); - } - operations.add( - ContentProviderOperation. - newUpdate(ProviderTableMeta.CONTENT_URI). - withValues(cv). - withSelection( - ProviderTableMeta._ID + "=?", - new String[] { String.valueOf(child.getFileId()) } - ). - build() - ); - } while (c.moveToNext()); - } - c.close(); - - /// 3. apply updates in batch - try { - if (getContentResolver() != null) { - getContentResolver().applyBatch(MainApp.getAuthority(), operations); - - } else { - getContentProviderClient().applyBatch(operations); - } - - } catch (OperationApplicationException e) { - Log_OC.e(TAG, "Fail to update descendants of " + - folder.getFileId() + " in database", e); - - } catch (RemoteException e) { - Log_OC.e(TAG, "Fail to update desendants of " + - folder.getFileId() + " in database", e); - } - - } - } - - public void moveLocalFile(OCFile file, String targetPath, String targetParentPath) { if (file != null && file.fileExists() && !OCFile.ROOT_PATH.equals(file.getFileName())) { OCFile targetParent = getFileByPath(targetParentPath); if (targetParent == null) { - // TODO panic + throw new IllegalStateException("Parent folder of the target path does not exist!!"); } /// 1. get all the descendants of the moved element in a single QUERY @@ -718,6 +640,8 @@ public class FileDataStorageManager { ArrayList operations = new ArrayList(c.getCount()); String defaultSavePath = FileStorageUtils.getSavePath(mAccount.name); + List originalPathsToTriggerMediaScan = new ArrayList(); + List newPathsToTriggerMediaScan = new ArrayList(); if (c.moveToFirst()) { int lengthOfOldPath = file.getRemotePath().length(); int lengthOfOldStoragePath = defaultSavePath.length() + lengthOfOldPath; @@ -731,11 +655,14 @@ public class FileDataStorageManager { if (child.getStoragePath() != null && child.getStoragePath().startsWith(defaultSavePath)) { // update link to downloaded content - but local move is not done here! - cv.put( - ProviderTableMeta.FILE_STORAGE_PATH, - defaultSavePath + targetPath + - child.getStoragePath().substring(lengthOfOldStoragePath) - ); + String targetLocalPath = defaultSavePath + targetPath + + child.getStoragePath().substring(lengthOfOldStoragePath); + + cv.put(ProviderTableMeta.FILE_STORAGE_PATH, targetLocalPath); + + originalPathsToTriggerMediaScan.add(child.getStoragePath()); + newPathsToTriggerMediaScan.add(targetLocalPath); + } if (child.getRemotePath().equals(file.getRemotePath())) { cv.put( @@ -766,27 +693,35 @@ public class FileDataStorageManager { } } catch (Exception e) { - Log_OC.e( - TAG, - "Fail to update " + file.getFileId() + " and descendants in database", - e - ); + Log_OC.e(TAG, "Fail to update " + file.getFileId() + " and descendants in database", e); } /// 4. move in local file system - String localPath = FileStorageUtils.getDefaultSavePathFor(mAccount.name, file); - File localFile = new File(localPath); + String originalLocalPath = FileStorageUtils.getDefaultSavePathFor(mAccount.name, file); + String targetLocalPath = defaultSavePath + targetPath; + File localFile = new File(originalLocalPath); boolean renamed = false; if (localFile.exists()) { - File targetFile = new File(defaultSavePath + targetPath); + File targetFile = new File(targetLocalPath); File targetFolder = targetFile.getParentFile(); if (!targetFolder.exists()) { targetFolder.mkdirs(); } renamed = localFile.renameTo(targetFile); } - Log_OC.d(TAG, "Local file RENAMED : " + renamed); - + + if (renamed) { + Iterator it = originalPathsToTriggerMediaScan.iterator(); + while (it.hasNext()) { + // Notify MediaScanner about removed file + triggerMediaScan(it.next()); + } + it = newPathsToTriggerMediaScan.iterator(); + while (it.hasNext()) { + // Notify MediaScanner about new file/folder + triggerMediaScan(it.next()); + } + } } } @@ -1402,7 +1337,7 @@ public class FileDataStorageManager { path = path + FileUtils.PATH_SEPARATOR; } - // Update OCFile with data from share: ShareByLink ¿and publicLink? + // Update OCFile with data from share: ShareByLink and publicLink OCFile file = getFileByPath(path); if (file != null) { if (share.getShareType().equals(ShareType.PUBLIC_LINK)) { @@ -1549,4 +1484,10 @@ public class FileDataStorageManager { //} } + public void triggerMediaScan(String path) { + Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE); + intent.setData(Uri.fromFile(new File(path))); + MainApp.getAppContext().sendBroadcast(intent); + } + } diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java index 392d03bc..cf25d278 100644 --- a/src/com/owncloud/android/datamodel/OCFile.java +++ b/src/com/owncloud/android/datamodel/OCFile.java @@ -18,15 +18,15 @@ package com.owncloud.android.datamodel; -import java.io.File; - -import com.owncloud.android.lib.common.utils.Log_OC; -import third_parties.daveKoeller.AlphanumComparator; - import android.os.Parcel; import android.os.Parcelable; import android.webkit.MimeTypeMap; +import com.owncloud.android.lib.common.utils.Log_OC; + +import java.io.File; + +import third_parties.daveKoeller.AlphanumComparator; public class OCFile implements Parcelable, Comparable { public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @@ -45,7 +45,7 @@ public class OCFile implements Parcelable, Comparable { public static final String ROOT_PATH = PATH_SEPARATOR; private static final String TAG = OCFile.class.getSimpleName(); - + private long mId; private long mParentId; private long mLength; @@ -61,7 +61,7 @@ public class OCFile implements Parcelable, Comparable { private boolean mKeepInSync; private String mEtag; - + private boolean mShareByLink; private String mPublicLink; @@ -73,9 +73,9 @@ public class OCFile implements Parcelable, Comparable { /** * Create new {@link OCFile} with given path. - * + *

* The path received must be URL-decoded. Path separator must be OCFile.PATH_SEPARATOR, and it must be the first character in 'path'. - * + * * @param path The remote path of the file. */ public OCFile(String path) { @@ -89,7 +89,7 @@ public class OCFile implements Parcelable, Comparable { /** * Reconstruct from parcel - * + * * @param source The source parcel */ private OCFile(Parcel source) { @@ -137,10 +137,10 @@ public class OCFile implements Parcelable, Comparable { dest.writeString(mRemoteId); dest.writeInt(mNeedsUpdateThumbnail ? 1 : 0); } - + /** * Gets the ID of the file - * + * * @return the file ID */ public long getFileId() { @@ -149,7 +149,7 @@ public class OCFile implements Parcelable, Comparable { /** * Returns the remote path of the file on ownCloud - * + * * @return The remote path to the file */ public String getRemotePath() { @@ -159,7 +159,7 @@ public class OCFile implements Parcelable, Comparable { /** * Can be used to check, whether or not this file exists in the database * already - * + * * @return true, if the file exists in the database */ public boolean fileExists() { @@ -168,7 +168,7 @@ public class OCFile implements Parcelable, Comparable { /** * Use this to find out if this file is a folder. - * + * * @return true if it is a folder */ public boolean isFolder() { @@ -177,7 +177,7 @@ public class OCFile implements Parcelable, Comparable { /** * Use this to check if this file is available locally - * + * * @return true if it is */ public boolean isDown() { @@ -187,10 +187,10 @@ public class OCFile implements Parcelable, Comparable { } return false; } - + /** * The path, where the file is stored locally - * + * * @return The local path to the file */ public String getStoragePath() { @@ -199,7 +199,7 @@ public class OCFile implements Parcelable, Comparable { /** * Can be used to set the path where the file is stored - * + * * @param storage_path to set */ public void setStoragePath(String storage_path) { @@ -208,7 +208,7 @@ public class OCFile implements Parcelable, Comparable { /** * Get a UNIX timestamp of the file creation time - * + * * @return A UNIX timestamp of the time that file was created */ public long getCreationTimestamp() { @@ -217,7 +217,7 @@ public class OCFile implements Parcelable, Comparable { /** * Set a UNIX timestamp of the time the file was created - * + * * @param creation_timestamp to set */ public void setCreationTimestamp(long creation_timestamp) { @@ -227,8 +227,8 @@ public class OCFile implements Parcelable, Comparable { /** * Get a UNIX timestamp of the file modification time. * - * @return A UNIX timestamp of the modification time, corresponding to the value returned by the server - * in the last synchronization of the properties of this file. + * @return A UNIX timestamp of the modification time, corresponding to the value returned by the server + * in the last synchronization of the properties of this file. */ public long getModificationTimestamp() { return mModifiedTimestamp; @@ -236,22 +236,22 @@ public class OCFile implements Parcelable, Comparable { /** * Set a UNIX timestamp of the time the time the file was modified. - * - * To update with the value returned by the server in every synchronization of the properties + *

+ * To update with the value returned by the server in every synchronization of the properties * of this file. - * + * * @param modification_timestamp to set */ public void setModificationTimestamp(long modification_timestamp) { mModifiedTimestamp = modification_timestamp; } - + /** * Get a UNIX timestamp of the file modification time. * - * @return A UNIX timestamp of the modification time, corresponding to the value returned by the server - * in the last synchronization of THE CONTENTS of this file. + * @return A UNIX timestamp of the modification time, corresponding to the value returned by the server + * in the last synchronization of THE CONTENTS of this file. */ public long getModificationTimestampAtLastSyncForData() { return mModifiedTimestampAtLastSyncForData; @@ -259,39 +259,38 @@ public class OCFile implements Parcelable, Comparable { /** * Set a UNIX timestamp of the time the time the file was modified. - * - * To update with the value returned by the server in every synchronization of THE CONTENTS + *

+ * To update with the value returned by the server in every synchronization of THE CONTENTS * of this file. - * - * @param modification_timestamp to set + * + * @param modificationTimestamp to set */ public void setModificationTimestampAtLastSyncForData(long modificationTimestamp) { mModifiedTimestampAtLastSyncForData = modificationTimestamp; } - - + /** * Returns the filename and "/" for the root directory - * + * * @return The name of the file */ public String getFileName() { File f = new File(getRemotePath()); return f.getName().length() == 0 ? ROOT_PATH : f.getName(); } - + /** * Sets the name of the file - * - * Does nothing if the new name is null, empty or includes "/" ; or if the file is the root directory + *

+ * Does nothing if the new name is null, empty or includes "/" ; or if the file is the root directory */ public void setFileName(String name) { Log_OC.d(TAG, "OCFile name changin from " + mRemotePath); if (name != null && name.length() > 0 && !name.contains(PATH_SEPARATOR) && !mRemotePath.equals(ROOT_PATH)) { String parent = (new File(getRemotePath())).getParent(); parent = (parent.endsWith(PATH_SEPARATOR)) ? parent : parent + PATH_SEPARATOR; - mRemotePath = parent + name; + mRemotePath = parent + name; if (isFolder()) { mRemotePath += PATH_SEPARATOR; } @@ -301,7 +300,7 @@ public class OCFile implements Parcelable, Comparable { /** * Can be used to get the Mimetype - * + * * @return the Mimetype as a String */ public String getMimetype() { @@ -311,10 +310,10 @@ public class OCFile implements Parcelable, Comparable { /** * Adds a file to this directory. If this file is not a directory, an * exception gets thrown. - * + * * @param file to add * @throws IllegalStateException if you try to add a something and this is - * not a directory + * not a directory */ public void addFile(OCFile file) throws IllegalStateException { if (isFolder()) { @@ -353,7 +352,7 @@ public class OCFile implements Parcelable, Comparable { /** * Sets the ID of the file - * + * * @param file_id to set */ public void setFileId(long file_id) { @@ -362,7 +361,7 @@ public class OCFile implements Parcelable, Comparable { /** * Sets the Mime-Type of the - * + * * @param mimetype to set */ public void setMimetype(String mimetype) { @@ -371,7 +370,7 @@ public class OCFile implements Parcelable, Comparable { /** * Sets the ID of the parent folder - * + * * @param parent_id to set */ public void setParentId(long parent_id) { @@ -380,7 +379,7 @@ public class OCFile implements Parcelable, Comparable { /** * Sets the file size in bytes - * + * * @param file_len to set */ public void setFileLength(long file_len) { @@ -389,7 +388,7 @@ public class OCFile implements Parcelable, Comparable { /** * Returns the size of the file in bytes - * + * * @return The filesize in bytes */ public long getFileLength() { @@ -398,7 +397,7 @@ public class OCFile implements Parcelable, Comparable { /** * Returns the ID of the parent Folder - * + * * @return The ID */ public long getParentId() { @@ -407,13 +406,13 @@ public class OCFile implements Parcelable, Comparable { /** * Check, if this file needs updating - * + * * @return */ public boolean needsUpdatingWhileSaving() { return mNeedsUpdating; } - + public boolean needsUpdateThumbnail() { return mNeedsUpdateThumbnail; } @@ -425,11 +424,11 @@ public class OCFile implements Parcelable, Comparable { public long getLastSyncDateForProperties() { return mLastSyncDateForProperties; } - + public void setLastSyncDateForProperties(long lastSyncDate) { mLastSyncDateForProperties = lastSyncDate; } - + public long getLastSyncDateForData() { return mLastSyncDateForData; } @@ -441,14 +440,14 @@ public class OCFile implements Parcelable, Comparable { public void setKeepInSync(boolean keepInSync) { mKeepInSync = keepInSync; } - + public boolean keepInSync() { return mKeepInSync; } - + @Override public int describeContents() { - return this.hashCode(); + return ((Object) this).hashCode(); } @Override @@ -465,13 +464,13 @@ public class OCFile implements Parcelable, Comparable { @Override public boolean equals(Object o) { - if(o instanceof OCFile){ + if (o instanceof OCFile) { OCFile that = (OCFile) o; - if(that != null){ + if (that != null) { return this.mId == that.mId; } } - + return false; } @@ -489,8 +488,8 @@ public class OCFile implements Parcelable, Comparable { public void setEtag(String etag) { this.mEtag = etag; } - - + + public boolean isShareByLink() { return mShareByLink; } @@ -515,22 +514,28 @@ public class OCFile implements Parcelable, Comparable { return 0; } - /** @return 'True' if the file contains audio */ + /** + * @return 'True' if the file contains audio + */ public boolean isAudio() { return (mMimeType != null && mMimeType.startsWith("audio/")); } - /** @return 'True' if the file contains video */ + /** + * @return 'True' if the file contains video + */ public boolean isVideo() { return (mMimeType != null && mMimeType.startsWith("video/")); } - /** @return 'True' if the file contains an image */ + /** + * @return 'True' if the file contains an image + */ public boolean isImage() { return ((mMimeType != null && mMimeType.startsWith("image/")) || - getMimeTypeFromName().startsWith("image/")); + getMimeTypeFromName().startsWith("image/")); } - + public String getMimeTypeFromName() { String extension = ""; int pos = mRemotePath.lastIndexOf('.'); diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index fdc35f8d..c9ad9611 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -400,6 +400,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis file.setFileLength((new File(mCurrentDownload.getSavePath()).length())); file.setRemoteId(mCurrentDownload.getFile().getRemoteId()); mStorageManager.saveFile(file); + mStorageManager.triggerMediaScan(file.getStoragePath()); } diff --git a/src/com/owncloud/android/operations/CreateShareOperation.java b/src/com/owncloud/android/operations/CreateShareOperation.java index c32c4771..b563790f 100644 --- a/src/com/owncloud/android/operations/CreateShareOperation.java +++ b/src/com/owncloud/android/operations/CreateShareOperation.java @@ -57,20 +57,20 @@ public class CreateShareOperation extends SyncOperation { /** * Constructor * @param path Full path of the file/folder being shared. Mandatory argument - * @param shareType ‘0’ = user, ‘1’ = group, ‘3’ = Public link. Mandatory argument + * @param shareType 0 = user, 1 = group, 3 = Public link. Mandatory argument * @param shareWith User/group ID with who the file should be shared. This is mandatory for shareType of 0 or 1 - * @param publicUpload If ‘false’ (default) public cannot upload to a public shared folder. - * If ‘true’ public can upload to a shared folder. Only available for public link shares + * @param publicUpload If false (default) public cannot upload to a public shared folder. + * If true public can upload to a shared folder. Only available for public link shares * @param password Password to protect a public link share. Only available for public link shares - * @param permissions 1 - Read only – Default for “public” shares + * @param permissions 1 - Read only - Default for public shares * 2 - Update * 4 - Create * 8 - Delete * 16- Re-share - * 31- All above – Default for “private” shares + * 31- All above - Default for private shares * For user or group shares. * To obtain combinations, add the desired values together. - * For instance, for “Re-Share”, “delete”, “read”, “update”, add 16+8+2+1 = 27. + * For instance, for Re-Share, delete, read, update, add 16+8+2+1 = 27. */ public CreateShareOperation(String path, ShareType shareType, String shareWith, boolean publicUpload, String password, int permissions, Intent sendIntent) { diff --git a/src/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java b/src/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java index c86c8b5e..5afc4210 100644 --- a/src/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java +++ b/src/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java @@ -36,7 +36,6 @@ import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation; import android.content.Context; import android.net.Uri; -import android.util.Log; /** * Operation to find out what authentication method requires diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java index 9f2bed72..0a5ff94c 100644 --- a/src/com/owncloud/android/operations/DownloadFileOperation.java +++ b/src/com/owncloud/android/operations/DownloadFileOperation.java @@ -150,13 +150,11 @@ public class DownloadFileOperation extends RemoteOperation { newFile = new File(getSavePath()); newFile.getParentFile().mkdirs(); moved = tmpFile.renameTo(newFile); - if (!moved) result = new RemoteOperationResult(RemoteOperationResult.ResultCode.LOCAL_STORAGE_NOT_MOVED); } Log_OC.i(TAG, "Download of " + mFile.getRemotePath() + " to " + getSavePath() + ": " + result.getLogMessage()); - return result; } diff --git a/src/com/owncloud/android/operations/GetSharesForFileOperation.java b/src/com/owncloud/android/operations/GetSharesForFileOperation.java index c319d620..649437d2 100644 --- a/src/com/owncloud/android/operations/GetSharesForFileOperation.java +++ b/src/com/owncloud/android/operations/GetSharesForFileOperation.java @@ -45,10 +45,10 @@ public class GetSharesForFileOperation extends SyncOperation { * Constructor * * @param path Path to file or folder - * @param reshares If set to ‘false’ (default), only shares from the current user are returned - * If set to ‘true’, all shares from the given file are returned - * @param subfiles If set to ‘false’ (default), lists only the folder being shared - * If set to ‘true’, all shared files within the folder are returned. + * @param reshares If set to false (default), only shares from the current user are returned + * If set to true, all shares from the given file are returned + * @param subfiles If set to false (default), lists only the folder being shared + * If set to true, all shared files within the folder are returned. */ public GetSharesForFileOperation(String path, boolean reshares, boolean subfiles) { mPath = path; diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java index 95a5a9ba..bd60e1fb 100644 --- a/src/com/owncloud/android/operations/RenameFileOperation.java +++ b/src/com/owncloud/android/operations/RenameFileOperation.java @@ -29,8 +29,6 @@ import com.owncloud.android.lib.resources.files.RenameRemoteFileOperation; import com.owncloud.android.operations.common.SyncOperation; import com.owncloud.android.utils.FileStorageUtils; -import android.accounts.Account; - /** * Remote operation performing the rename of a remote file (or folder?) in the ownCloud server. @@ -44,7 +42,6 @@ public class RenameFileOperation extends SyncOperation { private OCFile mFile; private String mRemotePath; - private Account mAccount; private String mNewName; private String mNewRemotePath; @@ -57,9 +54,8 @@ public class RenameFileOperation extends SyncOperation { * @param account OwnCloud account containing the remote file * @param newName New name to set as the name of file. */ - public RenameFileOperation(String remotePath, Account account, String newName) { + public RenameFileOperation(String remotePath, String newName) { mRemotePath = remotePath; - mAccount = account; mNewName = newName; mNewRemotePath = null; } @@ -103,7 +99,8 @@ public class RenameFileOperation extends SyncOperation { if (result.isSuccess()) { if (mFile.isFolder()) { - saveLocalDirectory(); + getStorageManager().moveLocalFile(mFile, mNewRemotePath, parent); + //saveLocalDirectory(); } else { saveLocalFile(); @@ -118,28 +115,24 @@ public class RenameFileOperation extends SyncOperation { return result; } - - private void saveLocalDirectory() { - getStorageManager().moveFolder(mFile, mNewRemotePath); - String localPath = FileStorageUtils.getDefaultSavePathFor(mAccount.name, mFile); - File localDir = new File(localPath); - if (localDir.exists()) { - localDir.renameTo(new File(FileStorageUtils.getSavePath(mAccount.name) + mNewRemotePath)); - // TODO - if renameTo fails, children files that are already down will result unlinked - } - } - private void saveLocalFile() { mFile.setFileName(mNewName); // try to rename the local copy of the file if (mFile.isDown()) { - File f = new File(mFile.getStoragePath()); + String oldPath = mFile.getStoragePath(); + File f = new File(oldPath); String parentStoragePath = f.getParent(); if (!parentStoragePath.endsWith(File.separator)) parentStoragePath += File.separator; if (f.renameTo(new File(parentStoragePath + mNewName))) { - mFile.setStoragePath(parentStoragePath + mNewName); + String newPath = parentStoragePath + mNewName; + mFile.setStoragePath(newPath); + + // notify MediaScanner about removed file - TODO really works? + getStorageManager().triggerMediaScan(oldPath); + // notify to scan about new file + getStorageManager().triggerMediaScan(newPath); } // else - NOTHING: the link to the local file is kept although the local name can't be updated // TODO - study conditions when this could be a problem diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java index a94454ce..21a8e2c9 100644 --- a/src/com/owncloud/android/providers/FileContentProvider.java +++ b/src/com/owncloud/android/providers/FileContentProvider.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.HashMap; import com.owncloud.android.R; -import com.owncloud.android.datamodel.ThumbnailsCacheManager; import com.owncloud.android.db.ProviderMeta; import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; import com.owncloud.android.lib.common.utils.Log_OC; diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java index a5bb22db..16c4dcca 100644 --- a/src/com/owncloud/android/services/OperationsService.java +++ b/src/com/owncloud/android/services/OperationsService.java @@ -359,7 +359,7 @@ public class OperationsService extends Service { // Rename file or folder String remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH); String newName = operationIntent.getStringExtra(EXTRA_NEWNAME); - operation = new RenameFileOperation(remotePath, account, newName); + operation = new RenameFileOperation(remotePath, newName); } else if (action.equals(ACTION_REMOVE)) { // Remove file or folder diff --git a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java index a78584ae..24534047 100644 --- a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java +++ b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java @@ -26,15 +26,15 @@ package com.owncloud.android.ui.dialog; */ import java.util.Vector; +import android.app.Dialog; +import android.os.Bundle; + import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.ui.activity.ComponentsGetter; import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener; -import android.app.Dialog; -import android.os.Bundle; - public class RemoveFileDialogFragment extends ConfirmationDialogFragment implements ConfirmationDialogFragmentListener { @@ -105,8 +105,7 @@ implements ConfirmationDialogFragmentListener { @Override public void onNeutral(String callerTag) { ComponentsGetter cg = (ComponentsGetter)getSherlockActivity(); - cg.getFileOperationsHelper() - .removeFile(mTargetFile, true); + cg.getFileOperationsHelper().removeFile(mTargetFile, true); FileDataStorageManager storageManager = cg.getStorageManager(); @@ -141,4 +140,4 @@ implements ConfirmationDialogFragmentListener { // nothing to do here } -} +} \ No newline at end of file diff --git a/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java b/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java index 530e920a..d285f1e4 100644 --- a/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java +++ b/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java @@ -22,12 +22,6 @@ package com.owncloud.android.ui.dialog; * * Triggers the rename operation. */ -import com.actionbarsherlock.app.SherlockDialogFragment; -import com.owncloud.android.R; -import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.resources.files.FileUtils; -import com.owncloud.android.ui.activity.ComponentsGetter; - import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; @@ -39,6 +33,12 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; +import com.actionbarsherlock.app.SherlockDialogFragment; +import com.owncloud.android.R; +import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.lib.resources.files.FileUtils; +import com.owncloud.android.ui.activity.ComponentsGetter; + /** * Dialog to input a new name for a file or folder to rename. @@ -125,12 +125,8 @@ extends SherlockDialogFragment implements DialogInterface.OnClickListener { Toast.LENGTH_LONG).show(); return; } - - ((ComponentsGetter)getSherlockActivity()). - getFileOperationsHelper().renameFile(mTargetFile, newFileName); - - + + ((ComponentsGetter)getSherlockActivity()).getFileOperationsHelper().renameFile(mTargetFile, newFileName); } } - } diff --git a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java index 5d3f7ace..1b7a1ddf 100644 --- a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java +++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java @@ -38,14 +38,14 @@ import com.owncloud.android.ui.ExtendedListView; import com.owncloud.android.ui.activity.OnEnforceableRefreshListener; /** - * TODO extending SherlockListFragment instead of SherlockFragment + * TODO extending SherlockListFragment instead of SherlockFragment */ public class ExtendedListFragment extends SherlockFragment implements OnItemClickListener, OnEnforceableRefreshListener { - + private static final String TAG = ExtendedListFragment.class.getSimpleName(); - private static final String KEY_SAVED_LIST_POSITION = "SAVED_LIST_POSITION"; + private static final String KEY_SAVED_LIST_POSITION = "SAVED_LIST_POSITION"; private static final String KEY_INDEXES = "INDEXES"; private static final String KEY_FIRST_POSITIONS= "FIRST_POSITIONS"; private static final String KEY_TOPS = "TOPS"; @@ -53,7 +53,7 @@ implements OnItemClickListener, OnEnforceableRefreshListener { private static final String KEY_EMPTY_LIST_MESSAGE = "EMPTY_LIST_MESSAGE"; protected ExtendedListView mList; - + private SwipeRefreshLayout mRefreshLayout; private SwipeRefreshLayout mRefreshEmptyLayout; private TextView mEmptyListMessage; @@ -72,18 +72,22 @@ implements OnItemClickListener, OnEnforceableRefreshListener { mList.invalidate(); } + public void setFooterView(View footer) { + mList.addFooterView(footer, null, false); + mList.invalidate(); + } + public ListView getListView() { return mList; } - - + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { Log_OC.e(TAG, "onCreateView"); - + View v = inflater.inflate(R.layout.list_fragment, null); mEmptyListMessage = (TextView) v.findViewById(R.id.empty_list_view); - mList = (ExtendedListView)(v.findViewById(R.id.list_root)); + mList = (ExtendedListView) (v.findViewById(R.id.list_root)); mList.setOnItemClickListener(this); mList.setDivider(getResources().getDrawable(R.drawable.uploader_list_separator)); @@ -93,7 +97,7 @@ implements OnItemClickListener, OnEnforceableRefreshListener { int referencePosition = savedInstanceState.getInt(KEY_SAVED_LIST_POSITION); setReferencePosition(referencePosition); } - + // Pull down refresh mRefreshLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipe_refresh_files); mRefreshEmptyLayout = (SwipeRefreshLayout) v.findViewById(R.id.swipe_refresh_files_emptyView); @@ -106,7 +110,6 @@ implements OnItemClickListener, OnEnforceableRefreshListener { return v; } - /** * {@inheritDoc} */ @@ -142,14 +145,16 @@ implements OnItemClickListener, OnEnforceableRefreshListener { savedInstanceState.putString(KEY_EMPTY_LIST_MESSAGE, getEmptyViewText()); } - /** - * Calculates the position of the item that will be used as a reference to reposition the visible items in the list when - * the device is turned to other position. + * Calculates the position of the item that will be used as a reference to + * reposition the visible items in the list when the device is turned to + * other position. * - * THe current policy is take as a reference the visible item in the center of the screen. + * THe current policy is take as a reference the visible item in the center + * of the screen. * - * @return The position in the list of the visible item in the center of the screen. + * @return The position in the list of the visible item in the center of the + * screen. */ protected int getReferencePosition() { if (mList != null) { @@ -159,11 +164,11 @@ implements OnItemClickListener, OnEnforceableRefreshListener { } } - /** * Sets the visible part of the list from the reference position. * - * @param position Reference position previously returned by {@link LocalFileListFragment#getReferencePosition()} + * @param position Reference position previously returned by + * {@link LocalFileListFragment#getReferencePosition()} */ protected void setReferencePosition(int position) { if (mList != null) { @@ -227,7 +232,7 @@ implements OnItemClickListener, OnEnforceableRefreshListener { @Override public void onItemClick (AdapterView parent, View view, int position, long id) { - // to be @overriden + // to be @overriden } @Override @@ -240,7 +245,6 @@ implements OnItemClickListener, OnEnforceableRefreshListener { mOnRefreshListener.onRefresh(); } } - public void setOnRefreshListener(OnEnforceableRefreshListener listener) { mOnRefreshListener = listener; } diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index db9f28f7..fd0b1a55 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -18,8 +18,10 @@ package com.owncloud.android.ui.fragment; import java.io.File; +import java.util.Vector; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.support.v4.widget.SwipeRefreshLayout; @@ -29,6 +31,8 @@ import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; +import android.widget.TextView; +import android.view.LayoutInflater; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; @@ -70,6 +74,7 @@ public class OCFileListFragment extends ExtendedListFragment { private OCFile mFile = null; private FileListListAdapter mAdapter; + private View mFooterView; private OCFile mTargetFile; @@ -112,24 +117,28 @@ public class OCFileListFragment extends ExtendedListFragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); Log_OC.e(TAG, "onActivityCreated() start"); - + if (savedInstanceState != null) { mFile = savedInstanceState.getParcelable(KEY_FILE); } - + + mFooterView = ((LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate( + R.layout.list_footer, null, false); + setFooterView(mFooterView); + Bundle args = getArguments(); boolean justFolders = (args == null) ? false : args.getBoolean(ARG_JUST_FOLDERS, false); mAdapter = new FileListListAdapter( justFolders, getSherlockActivity(), mContainerActivity - ); + ); setListAdapter(mAdapter); - + registerForContextMenu(getListView()); getListView().setOnCreateContextMenuListener(this); - } - + } + /** * Saves the current listed folder. */ @@ -384,9 +393,51 @@ public class OCFileListFragment extends ExtendedListFragment { mList.setSelectionFromTop(0, 0); } mFile = directory; + + // Update Footer + TextView footerText = (TextView) mFooterView.findViewById(R.id.footerText); + Log_OC.d("footer", String.valueOf(System.currentTimeMillis())); + footerText.setText(generateFooterText(directory)); + Log_OC.d("footer", String.valueOf(System.currentTimeMillis())); } } + private String generateFooterText(OCFile directory) { + Integer files = 0; + Integer folders = 0; + + FileDataStorageManager storageManager = mContainerActivity.getStorageManager(); + Vector mFiles = storageManager.getFolderContent(mFile); + + for (OCFile ocFile : mFiles) { + if (ocFile.isFolder()) { + folders++; + } else { + files++; + } + } + + String output = ""; + + if (files > 0){ + if (files == 1) { + output = output + files.toString() + " " + getResources().getString(R.string.file_list_file); + } else { + output = output + files.toString() + " " + getResources().getString(R.string.file_list_files); + } + } + if (folders > 0 && files > 0){ + output = output + ", "; + } + if (folders == 1) { + output = output + folders.toString() + " " + getResources().getString(R.string.file_list_folder); + } else if (folders > 1) { + output = output + folders.toString() + " " + getResources().getString(R.string.file_list_folders); + } + + return output; + } + public void sortByName(boolean descending) { mAdapter.setSortOrder(FileListListAdapter.SORT_NAME, descending); } diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 4dd5c436..a3814c77 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -328,7 +328,7 @@ public class PreviewImageFragment extends FileFragment { finish(); } - + private class BitmapLoader extends AsyncTask { /** diff --git a/third_party/android-support-library/android-support-v4.jar b/third_party/android-support-library/android-support-v4.jar index 187bdf48..d0b85355 100644 Binary files a/third_party/android-support-library/android-support-v4.jar and b/third_party/android-support-library/android-support-v4.jar differ