From: David A. Velasco Date: Thu, 4 Apr 2013 14:49:04 +0000 (+0200) Subject: Merge branch 'bug_hunting' into feature_previews X-Git-Tag: oc-android-1.4.3~39^2~5 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/053aad5ae17a1ad7a15218c220810e6b369fea4c?hp=97ae9007e465ef352bdc5860db499e1cd21089ff Merge branch 'bug_hunting' into feature_previews Conflicts: src/com/owncloud/android/ui/activity/FileDisplayActivity.java --- diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 341cbc5e..5262d68a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -35,7 +35,8 @@ - + + @@ -58,6 +59,9 @@ + + + @@ -86,6 +90,13 @@ + + + + + - - + + + - + - + - + - - - - - + + + @@ -158,7 +168,7 @@ - + - + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..5d0c02f2 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,39 @@ +## Submitting issues + +If you have questions about how to use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc]. + +### Guidelines +* [Report the issue](https://github.com/owncloud/android/issues/new) using our [template][template], it includes all the informations we need to track down the issue. +* This repository is *only* for issues within the ownCloud Android app code. Issues in other compontents should be reported in their own repositores: + - [ownCloud code](https://github.com/owncloud/core/issues) + - [iOS client](https://github.com/owncloud/ios-issues/issues) + - [Desktop client](https://github.com/owncloud/mirall/issues) + - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar, Contacts...) +* Search the existing issues first, it's likely that your issue was already reported. + +If your issue appears to be a bug, and hasn't been reported, open a new issue. + +Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues. + +[template]: https://raw.github.com/owncloud/android/master/issue_template.md +[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud +[forum]: http://forum.owncloud.org/ +[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4 + +## Contributing to Source Code + +Thanks for wanting to contribute source code to ownCloud. That's great! + +Before we're able to merge your code into the ownCloud app for Android, you need to sign our [Contributor Agreement][agreement]. + +### Guidelines +* Contribute your code in the branch 'develop'. It will give us a better chance to test your code before merging it with stable code. +* For your first contribution, start a pull request on develop and send us the signed [Contributor Agreement][agreement]. +* Keep on using pull requests for your next contributions although you own write permissions. + +[agreement]: http://owncloud.org/about/contributor-agreement/ + +## Translations +Please submit translations via [Transifex][transifex]. + +[transifex]: https://www.transifex.com/projects/p/owncloud/ diff --git a/README.md b/README.md new file mode 100644 index 00000000..3ba9f73a --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +This is the android client for [owncloud][0]. + +Make sure you read [SETUP.md][1] when you start working on this project. + +[0]: https://github.com/owncloud/core +[1]: https://raw.github.com/owncloud/android/master/SETUP.md \ No newline at end of file diff --git a/README.setup b/README.setup deleted file mode 100644 index 3d592e06..00000000 --- a/README.setup +++ /dev/null @@ -1,13 +0,0 @@ -If you want to start development of ownCloud android client you have two way to do so -(a) building with console -(b) building with eclipse - -1. Use setup_env.sh -2a. ant clean;ant debug -2b. Open Eclipse and import actionbarsherlock/library project to your workspace - -after those space you should be good to go. - -HAVE FUN! - -NOTE: You must have 'tools' and 'platforms-tools' in your path in order to run setup_env.sh diff --git a/SETUP.md b/SETUP.md new file mode 100644 index 00000000..d527d4fe --- /dev/null +++ b/SETUP.md @@ -0,0 +1,23 @@ + + If you want to start development of ownCloud android client you have two way to do so: + + 1. Building with console: + + - Use setup_env.sh or setup_env.bat + - NOTE: You must have git, ant/bin, android/tools in your enviroment path + + 2. Building with eclipse: + + - Run ant clean debug + - Open Eclipse and import *actionbarsherlock/library* project to your workspace + - NOTE: You must have 'tools' and 'platforms-tools' in your path in order to run setup_env.sh + + After those actions you should be good to go. + + HAVE FUN! + + + + + + diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt new file mode 100644 index 00000000..1d51b72a --- /dev/null +++ b/THIRD_PARTY.txt @@ -0,0 +1,64 @@ +################################################################### + ownCloud Android client + + Copyright (C) 2012-2013 ownCloud Inc. + Copyright (C) 2012 Bartek Przybylski +################################################################### + + +########### +# LICENSE # +########### + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 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 General Public License for more details. + +The source distribution of this program should include a full copy +of the GNU GPL version 2 license in the LICENSE.txt file located +in its root directory. If not, see . + + +######################## +# THIRD PARTY LICENSES # +######################## + +Both the source and binary distributions of this software contain +some third party software. All the third party software included +or linked is redistributed under the terms and conditions of their +original licenses. These licenses are compatible the GPL license +that govern this software, for the purposes they are being used. + +The third party software included and used by this project is: + + * Apache JackRabbit, version 2.2.5. + Copyright (C) 2004-2010 The Apache Software Foundation. + Licensed under Apache License, Version 2.0. + Placed at libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar + The jar file must be included in the ownCloud client APK. + Original license document included at libs/LICENSE.txt + See http://jackrabbit.apache.org/ + + * Transifex client.JavaMail API, version 1.4.3 + Copyright (C) Transifex. + Licensed under GNU General Public License. + Placed at third_party/transifex-client. + Used as a helper tool, not included in the ownCloud client APK. + Original license document included at third_party/transifex-client/LICENSE. + See http://help.transifex.com/features/client/ + + * ActionBarSherlock, master branch. + Copyright (C) 2012 Jake Wharton. + Licensed under Apache License, Version 2.0. + The official repository is linked as a submodule in the + ownCloud/android repository. + A binary JAR file must be generated from this linked project + and included in the ownCloud client APK. + See http://http://actionbarsherlock.com/ + \ No newline at end of file diff --git a/issue_template.md b/issue_template.md new file mode 100644 index 00000000..493572d2 --- /dev/null +++ b/issue_template.md @@ -0,0 +1,32 @@ +### Expected behaviour +Tell us what should happen + +### Actual behaviour +Tell us what happens instead + +### Steps to reproduce +1. +2. +3. + +### Environment data +Android version: + +Device model: + +Stock or customized system: + +ownCloud app version: + +ownCloud server version: + +### Logs +#### Web server error log +``` +Insert your webserver log here +``` + +#### ownCloud log (data/owncloud.log) +``` +Insert your ownCloud log here +``` diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..27263337 --- /dev/null +++ b/pom.xml @@ -0,0 +1,100 @@ + + + + 4.0.0 + com.owncloud.android + owncloud + 1.3.21-SNAPSHOT + apk + Owncloud Android + + + 1.6 + 4.1.1.4 + r7 + 4.2.0 + + + https://github.com/owncloud/android + Owncloud for Android + + scm:git:git@github.com:owncloud/android.git + scm:git:git@github.com:owncloud/android.git + https://github.com/owncloud/android + + + + + + com.google.android + android + ${google.android-version} + provided + + + + com.google.android + support-v4 + ${google.android.support-version} + + + + com.actionbarsherlock + actionbarsherlock + ${actionbarsherlock-version} + provided + + + + com.actionbarsherlock + actionbarsherlock + ${actionbarsherlock-version} + apklib + + + + org.apache.jackrabbit + jackrabbit-webdav + 2.5.2 + + + + + + ${project.artifactId} + + src + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + ${java-version} + ${java-version} + + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + 3.5.0 + + + + ${env.ANDROID_HOME} + 17 + + + true + + + + + + + + diff --git a/res/drawable-hdpi/image_fail.png b/res/drawable-hdpi/image_fail.png new file mode 100644 index 00000000..38667417 Binary files /dev/null and b/res/drawable-hdpi/image_fail.png differ diff --git a/res/drawable-ldpi/image_fail.png b/res/drawable-ldpi/image_fail.png new file mode 100644 index 00000000..77513ad2 Binary files /dev/null and b/res/drawable-ldpi/image_fail.png differ diff --git a/res/drawable-mdpi/image_fail.png b/res/drawable-mdpi/image_fail.png new file mode 100644 index 00000000..8e650cd3 Binary files /dev/null and b/res/drawable-mdpi/image_fail.png differ diff --git a/res/layout/audio_player.xml b/res/layout/audio_player.xml new file mode 100644 index 00000000..bee0f870 --- /dev/null +++ b/res/layout/audio_player.xml @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/failed_upload_files.xml b/res/layout/failed_upload_files.xml new file mode 100644 index 00000000..b307ff81 --- /dev/null +++ b/res/layout/failed_upload_files.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + +