From: Andy Scherzinger Date: Sat, 28 Nov 2015 10:48:57 +0000 (+0100) Subject: Merge branch 'target_marshmallow' of https://github.com/owncloud/android into beta X-Git-Tag: beta-20151129~2^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c94b5314b750083451bfc2587c5a492a057a88c4?hp=f8ed0f6ae79c9d174dd082d3ac9101a6f8859842 Merge branch 'target_marshmallow' of https://github.com/owncloud/android into beta Conflicts: build.gradle --- diff --git a/.gitignore b/.gitignore index 8346dbfc..009ead45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ # built application files -*.apk *.ap_ # files for the dex VM @@ -14,6 +13,7 @@ build/ *.iml gen/ target/ +build/ # Local configuration files (sdk path, etc) local.properties @@ -39,4 +39,4 @@ tests/proguard-project.txt build # Actionbarsherlock is now ignored since scripts takes care of init the sub-modules. -actionbarsherlock \ No newline at end of file +actionbarsherlock diff --git a/.travis.yml b/.travis.yml index f50da95f..11e5f40f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,6 @@ before_install: - rm pom.xml script: - ./setup_env.sh ant - - ant clean - - ant debug + - ant clean -Djava.source=7 -Djava.target=7 + - ant debug -Djava.source=7 -Djava.target=7 diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 260cb116..a1fb0745 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,11 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . ---> - + --> + - + + + @@ -114,7 +117,7 @@ android:name=".providers.FileContentProvider" android:authorities="@string/authority" android:enabled="true" - android:exported="false" + android:exported="true" android:label="@string/sync_string_files" android:syncable="true" /> @@ -125,6 +128,12 @@ android:exported="false" android:label="@string/search_users_and_groups_hint" /> + + + - - - - - - + + + + + + + + @@ -174,6 +185,10 @@ + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 099a4456..992ab777 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,60 +1,65 @@ -## 1.8.0 (September 2015) -- New MATERIAL DESIGN theme -- Updated FILE TYPE ICONS -- Preview TXT files within the app -- COPY files & folders -- Preview the full file/folder name from the long press menu -- Set a file as FAVORITE (kept-in-sync) from the CONTEXT MENU -- Updated CONFLICT RESOLUTION dialog (wording) -- Updated background for images with TRANSPARENCY in GALLERY -- Hidden files will not enforce list view instead of GRID VIEW (folders from Picasa & others) -- Security: - + Updated network stack with security fixes (Jackrabbit 2.10.1) -- Bugs fixed: - + Fixed crash when ETag is lost - + Passcode creation not restarted on device rotation - + Recovered share icon shown on folders 'shared with me' - + User name added to subject when sending a share link through e-mail (fixed on SAMLed apps) - -## 1.7.2 (July 2015) -- New navigation drawer -- Improved Passcode -- Automatic grid view just for folders full of images -- More characters allowed in file names -- Support for servers in same domain, different path -- Bugs fixed: - + Frequent crashes in folder with several images - + Sync error in servers with huge quota and external storage enable - + Share by link error - + Some other crashes and minor bugs - -## 1.7.1 (April 2015) - -- Share link even with password enforced by server -- Get the app ready for oc 8.1 servers -- Added option to create new folder in uploads from external apps -- Improved management of deleted users -- Bugs fixed - + Fixed crash on Android 2.x devices - + Improvements on uploads - -## 1.7.0 (February 2015) - -- Download full folders -- Grid view for images -- Remote thumbnails (OC Server 8.0+) -- Added number of files and folders at the end of the list -- "Open with" in contextual menu -- Downloads added to Media Provider -- Uploads: - + Local thumbnails in section "Files" - + Multiple selection in "Content from other apps" (Android 4.3+) -- Gallery: - + proper handling of EXIF - + obey sorting in the list of files -- Settings view updated -- Improved subjects in e-mails -- Bugs fixed +# 2015-11-28 +- update all PR +- PR [#1191] (https://github.com/owncloud/android/pull/1191) "Cancel upload on wlan exit" merged +# 2015-11-21 +- fix #1297 +- update all PR +- try for #1278 +# 2015-11-20 +- PR [#1293] (https://github.com/owncloud/android/pull/1293) "External SD by przybylski" merged +- PR [#1296] (https://github.com/owncloud/android/pull/1296) "Don't allow to remove passcode without entering it. Don't allow to set incomplete passcode by przybylski" merged + +# 2015-11-18 +- update all PR +- fix #1259 + +# 2015-11-13 +- update all PR + +# 2015-11-10 +- update master +- PR [#1277] (https://github.com/owncloud/android/pull/1277) "Optimized uploader layout and user configured sorting" merged + +# 2015-11-05 +- update master +- fix #1244 +- add changelog +- add check for update of beta version + +# 2015-11-02 +- PR [#1240](https://github.com/owncloud/android/pull/1240) "Set as wallpaper" merged +- updated other PRs + +# 2015-11-01 +- PR [#1236](https://github.com/owncloud/android/pull/1236) "Streaming video/audio" merged +- PR [#1035](https://github.com/owncloud/android/pull/1035) "Enable video thumbnail" merged + +# 2015-10-31 +- updated all PR +- bugfix: #1234, #1230 +- implement Crash Handler +- implement direct download of latest apk in settings -> last item on bottom + +# 2015-10-30 +- fixed problem with Authority + +# 2015-10-29 +- PR [#1099](https://github.com/owncloud/android/pull/1099) "Switch list vs grid" merged +- PR [#1100](https://github.com/owncloud/android/pull/1100) "Material FAB with speed dial implementation" merged +- PR [#1209](https://github.com/owncloud/android/pull/1209) "Material buttons - before in #1090" merged +- PR [#1205](https://github.com/owncloud/android/pull/1205) "Switch between online and offline files" merged +- PR [#1195](https://github.com/owncloud/android/pull/1195) "Resize Cache" merged +- PR [#1187](https://github.com/owncloud/android/pull/1187) "Video: Big thumbnails" merged +- PR [#1058](https://github.com/owncloud/android/pull/1058) "add sort to UploadFileActiviy" merged +- PR [#1168](https://github.com/owncloud/android/pull/1168) "Avoid duplicate files" merged +- PR [#1176](https://github.com/owncloud/android/pull/1176) "Multi select" merged + + +# 2015-10-26 +- start of branch +- PR [#745](https://github.com/owncloud/android/pull/745) merged +- PR [#1044](https://github.com/owncloud/android/pull/1044) merged: < 8.1: GalleryPlus app needed, >= 8.2 Gallery app needed +- PR [#1111](https://github.com/owncloud/android/pull/1111) merged \ No newline at end of file diff --git a/README.md b/README.md index e3ff5353..a2391447 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,18 @@ -#This is the Android client for [ownCloud][0] +#This is the BETA Android client for [ownCloud][0] + +The BETA app is only intended to be used by experienced users that want to use and test the latest features. +All pull requests labeled "3 - to review" or higher will be included into the branch. + +If you find a bug please verify first if it is *really* a bug in beta, then comment in the corresponding pull request or create a new issue with the prefix "Beta YYYY-MM-DD:". + +The compiled APKs can be found [here][2] + +The changelog is found [here][3] The app performs file synchronization with an ownCloud server. Other ownCloud features may be added in the future, but they are not a priority right now. ## Build Status on -Git master: ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=master) - -Git stable: ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=stable) +Git beta: ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=beta) ## Development @@ -14,6 +21,8 @@ Make sure you read [SETUP.md][1] when you start working on this project. [0]: https://github.com/owncloud/core [1]: https://github.com/owncloud/android/blob/master/SETUP.md +[2]: https://github.com/owncloud/android/tree/beta/apks/ +[3]: https://github.com/owncloud/android/blob/beta/CHANGELOG.md ### Contributing Please see [Contribution Guidelines](https://owncloud.org/contribute/). Fork this repository and contribute back using diff --git a/apks/latest b/apks/latest new file mode 100644 index 00000000..63174050 --- /dev/null +++ b/apks/latest @@ -0,0 +1 @@ +20151128 diff --git a/apks/owncloud-beta-20151120.apk b/apks/owncloud-beta-20151120.apk new file mode 100644 index 00000000..056d0ecc Binary files /dev/null and b/apks/owncloud-beta-20151120.apk differ diff --git a/apks/owncloud-beta-20151121.apk b/apks/owncloud-beta-20151121.apk new file mode 100644 index 00000000..31fc126f Binary files /dev/null and b/apks/owncloud-beta-20151121.apk differ diff --git a/apks/owncloud-beta-20151124.apk b/apks/owncloud-beta-20151124.apk new file mode 100644 index 00000000..26535e0e Binary files /dev/null and b/apks/owncloud-beta-20151124.apk differ diff --git a/apks/owncloud-beta-20151125.apk b/apks/owncloud-beta-20151125.apk new file mode 100644 index 00000000..5eb3ff18 Binary files /dev/null and b/apks/owncloud-beta-20151125.apk differ diff --git a/apks/owncloud-beta-20151128.apk b/apks/owncloud-beta-20151128.apk new file mode 100644 index 00000000..3b81dd3c Binary files /dev/null and b/apks/owncloud-beta-20151128.apk differ diff --git a/build.gradle b/build.gradle index 2a397999..8c68fa73 100644 --- a/build.gradle +++ b/build.gradle @@ -34,6 +34,12 @@ android { // http://developer.android.com/about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client useLibrary 'org.apache.http.legacy' + defaultConfig { + applicationId "com.owncloud.android.beta" + versionCode 20151128 + versionName "ownCloud beta" + } + sourceSets { main { manifest.srcFile 'AndroidManifest.xml' @@ -64,13 +70,26 @@ android { } } + productFlavors { + } + packagingOptions { exclude 'META-INF/LICENSE.txt' } -} - - - + signingConfigs { + release { + storeFile file(RELEASE_STORE_FILE) + storePassword RELEASE_STORE_PASSWORD + keyAlias RELEASE_KEY_ALIAS + keyPassword RELEASE_KEY_PASSWORD + } + } + buildTypes { + release { + signingConfig signingConfigs.release + } + } +} diff --git a/oc_jb_workaround/build.gradle b/oc_jb_workaround/build.gradle index 2fcc9f6c..4a48a297 100644 --- a/oc_jb_workaround/build.gradle +++ b/oc_jb_workaround/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:1.3.0' } } apply plugin: 'com.android.library' diff --git a/owncloud-android-library b/owncloud-android-library index 9e5c44dd..8966dbce 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit 9e5c44ddb58970f1bbdf6723145a47379bdbccba +Subproject commit 8966dbcee044cec726633fdfd208ea106cf176c0 diff --git a/res/drawable-hdpi/ic_action_download_grey.png b/res/drawable-hdpi/ic_action_download_grey.png new file mode 100644 index 00000000..4ac1e261 Binary files /dev/null and b/res/drawable-hdpi/ic_action_download_grey.png differ diff --git a/res/drawable-hdpi/ic_view_list.png b/res/drawable-hdpi/ic_view_list.png new file mode 100644 index 00000000..64ad8e14 Binary files /dev/null and b/res/drawable-hdpi/ic_view_list.png differ diff --git a/res/drawable-hdpi/ic_view_module.png b/res/drawable-hdpi/ic_view_module.png new file mode 100644 index 00000000..7982e383 Binary files /dev/null and b/res/drawable-hdpi/ic_view_module.png differ diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png index 6fe153bb..2430c947 100644 Binary files a/res/drawable-hdpi/icon.png and b/res/drawable-hdpi/icon.png differ diff --git a/res/drawable-hdpi/view_play.png b/res/drawable-hdpi/view_play.png new file mode 100644 index 00000000..53717245 Binary files /dev/null and b/res/drawable-hdpi/view_play.png differ diff --git a/res/drawable-mdpi/ic_action_download_grey.png b/res/drawable-mdpi/ic_action_download_grey.png new file mode 100644 index 00000000..29103c54 Binary files /dev/null and b/res/drawable-mdpi/ic_action_download_grey.png differ diff --git a/res/drawable-mdpi/ic_view_list.png b/res/drawable-mdpi/ic_view_list.png new file mode 100644 index 00000000..4aca55c6 Binary files /dev/null and b/res/drawable-mdpi/ic_view_list.png differ diff --git a/res/drawable-mdpi/ic_view_module.png b/res/drawable-mdpi/ic_view_module.png new file mode 100644 index 00000000..f308a32b Binary files /dev/null and b/res/drawable-mdpi/ic_view_module.png differ diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png index 9008b9d3..2d7ab660 100644 Binary files a/res/drawable-mdpi/icon.png and b/res/drawable-mdpi/icon.png differ diff --git a/res/drawable-mdpi/view_play.png b/res/drawable-mdpi/view_play.png new file mode 100644 index 00000000..77b20272 Binary files /dev/null and b/res/drawable-mdpi/view_play.png differ diff --git a/res/drawable-xhdpi/ic_action_download_grey.png b/res/drawable-xhdpi/ic_action_download_grey.png new file mode 100644 index 00000000..29103c54 Binary files /dev/null and b/res/drawable-xhdpi/ic_action_download_grey.png differ diff --git a/res/drawable-xhdpi/ic_action_settings.png b/res/drawable-xhdpi/ic_action_settings.png new file mode 100644 index 00000000..a19fc5c3 Binary files /dev/null and b/res/drawable-xhdpi/ic_action_settings.png differ diff --git a/res/drawable-xhdpi/ic_view_list.png b/res/drawable-xhdpi/ic_view_list.png new file mode 100644 index 00000000..b81d9102 Binary files /dev/null and b/res/drawable-xhdpi/ic_view_list.png differ diff --git a/res/drawable-xhdpi/ic_view_module.png b/res/drawable-xhdpi/ic_view_module.png new file mode 100644 index 00000000..b3548535 Binary files /dev/null and b/res/drawable-xhdpi/ic_view_module.png differ diff --git a/res/drawable-xhdpi/icon.png b/res/drawable-xhdpi/icon.png index 041efc6b..a135cc26 100644 Binary files a/res/drawable-xhdpi/icon.png and b/res/drawable-xhdpi/icon.png differ diff --git a/res/drawable-xhdpi/view_play.png b/res/drawable-xhdpi/view_play.png new file mode 100644 index 00000000..8482788e Binary files /dev/null and b/res/drawable-xhdpi/view_play.png differ diff --git a/res/drawable-xxhdpi/ic_action_download_grey.png b/res/drawable-xxhdpi/ic_action_download_grey.png new file mode 100644 index 00000000..c4d0b0ce Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_download_grey.png differ diff --git a/res/drawable-xxhdpi/ic_action_settings.png b/res/drawable-xxhdpi/ic_action_settings.png new file mode 100644 index 00000000..6a70402b Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_settings.png differ diff --git a/res/drawable-xxhdpi/ic_settings.png b/res/drawable-xxhdpi/ic_settings.png deleted file mode 100644 index 6a70402b..00000000 Binary files a/res/drawable-xxhdpi/ic_settings.png and /dev/null differ diff --git a/res/drawable-xxhdpi/icon.png b/res/drawable-xxhdpi/icon.png new file mode 100644 index 00000000..ad0fd25f Binary files /dev/null and b/res/drawable-xxhdpi/icon.png differ diff --git a/res/drawable-xxhdpi/view_play.png b/res/drawable-xxhdpi/view_play.png new file mode 100644 index 00000000..fea738b9 Binary files /dev/null and b/res/drawable-xxhdpi/view_play.png differ diff --git a/res/drawable-xxxhdpi/icon.png b/res/drawable-xxxhdpi/icon.png new file mode 100644 index 00000000..c0ec25c1 Binary files /dev/null and b/res/drawable-xxxhdpi/icon.png differ diff --git a/res/drawable-xxxhdpi/view_play.png b/res/drawable-xxxhdpi/view_play.png new file mode 100644 index 00000000..3786b4d0 Binary files /dev/null and b/res/drawable-xxxhdpi/view_play.png differ diff --git a/res/layout/error_send.xml b/res/layout/error_send.xml new file mode 100644 index 00000000..7a80166b --- /dev/null +++ b/res/layout/error_send.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + +