diff --git a/.classpath b/.classpath index dec02b33c..bccf1c8f2 100644 --- a/.classpath +++ b/.classpath @@ -1,9 +1,10 @@ - - + + + diff --git a/.google_apis/drive-v2/drive/descriptor.json b/.google_apis/drive-v2/drive/descriptor.json new file mode 100644 index 000000000..0ad589e89 --- /dev/null +++ b/.google_apis/drive-v2/drive/descriptor.json @@ -0,0 +1,705 @@ +{ + "discoveryLink": "./apis/drive/v2/rest", + "kind": "discovery#directoryItem", + "description": "The API to interact with Drive.", + "title": "Drive API", + "discoveryRestUrl": "https://www.googleapis.com/discovery/v1/apis/drive/v2/rest", + "preferred": true, + "version": "v2", + "icons": { + "x32": "https://ssl.gstatic.com/docs/doclist/images/drive_icon_32.png", + "x16": "https://ssl.gstatic.com/docs/doclist/images/drive_icon_16.png" + }, + "documentationLink": "https://developers.google.com/drive/", + "id": "drive:v2", + "name": "drive", + "packagePath": null, + "canonicalName": null, + "files": [ + { + "downloadUrl": "/downloads/drive/v2/70/java/1.12.0-beta/google-api-services-drive-v2-rev70-1.12.0-beta.jar", + "path": "google-api-services-drive-v2-rev70-1.12.0-beta.jar", + "type": "binary", + "timestamp": "2013-04-17 06:10" + }, + { + "downloadUrl": "/downloads/drive/v2/70/java/1.12.0-beta/google-api-services-drive-v2-rev70-1.12.0-beta-javadoc.jar", + "path": "google-api-services-drive-v2-rev70-1.12.0-beta-javadoc.jar", + "type": "documentation", + "timestamp": "2013-04-17 06:10" + }, + { + "downloadUrl": "/downloads/drive/v2/70/java/1.12.0-beta/google-api-services-drive-v2-rev70-1.12.0-beta-sources.jar", + "path": "google-api-services-drive-v2-rev70-1.12.0-beta-sources.jar", + "type": "source", + "timestamp": "2013-04-17 06:10" + }, + { + "path": "google-api-services-drive-v2-rev70-1.12.0-beta.jar.properties", + "type": "android.properties" + } + ], + "revision": 70, + "language": "java", + "language_version": "1.12.0-beta", + "dependencies": [ + { + "files": [ + { + "downloadUrl": "http://google-api-java-client.googlecode.com/files/google-api-java-client-1.12.0-beta.zip", + "type": "bundle" + } + ], + "version": "1.12.0-beta", + "name": "Google API Java Client Bundle", + "environments": [ + "manual" + ] + }, + { + "files": [ + { + "path": "libs/google-api-client-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-api-client-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-api-client-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Google APIs Client Library", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/google-api-client-android-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-api-client-android-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-api-client-android-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Android platform extensions to the Google APIs Client Library", + "environments": [ + "android" + ] + }, + { + "files": [ + { + "path": "libs/google-api-client-appengine-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-api-client-appengine-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Google App Engine extensions to the Google APIs Client Library", + "environments": [ + "appengine" + ] + }, + { + "files": [ + { + "path": "libs/google-api-client-java6-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-api-client-java6-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Java 6 (and higher) extensions to the Google APIs Client Library", + "environments": [ + "generic" + ] + }, + { + "files": [ + { + "path": "libs/google-oauth-client-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-oauth-client-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-oauth-client-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Google OAuth Client Library", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/google-oauth-client-appengine-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-oauth-client-appengine-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Google App Engine extensions to the Google OAuth Client Library", + "environments": [ + "appengine" + ] + }, + { + "files": [ + { + "path": "libs/google-oauth-client-java6-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-oauth-client-java6-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Java 6 (and higher) extensions to the Google OAuth Client Library", + "environments": [ + "generic" + ] + }, + { + "files": [ + { + "path": "libs/google-oauth-client-jetty-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-oauth-client-jetty-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Jetty extensions to the Google OAuth Client Library", + "environments": [ + "generic" + ] + }, + { + "files": [ + { + "path": "libs/google-oauth-client-servlet-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-oauth-client-servlet-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Servlet and JDO extensions to the Google OAuth Client Library", + "environments": [ + "appengine", + "servlet" + ] + }, + { + "files": [ + { + "path": "libs/google-http-client-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-http-client-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-http-client-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Google HTTP Client Library", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/google-http-client-android-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-http-client-android-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-http-client-android-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Android platform extensions to the Google HTTP Client Library", + "environments": [ + "android" + ] + }, + { + "files": [ + { + "path": "libs/google-http-client-appengine-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-http-client-appengine-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Google App Engine extensions to the Google HTTP Client Library", + "environments": [ + "appengine" + ] + }, + { + "files": [ + { + "path": "libs/google-http-client-gson-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-http-client-gson-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-http-client-gson-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "GSON extensions to the Google HTTP Client Library", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/google-http-client-jackson-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-http-client-jackson-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-http-client-jackson-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Jackson extensions to the Google HTTP Client Library", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/google-http-client-jackson2-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-http-client-jackson2-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-http-client-jackson2-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Jackson 2 extensions to the Google HTTP Client Library", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/commons-logging-1.1.1.jar", + "type": "binary" + }, + { + "path": "libs-sources/commons-logging-1.1.1-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.1.1", + "name": "Commons Logging", + "environments": [ + "servlet", + "generic" + ] + }, + { + "files": [ + { + "path": "libs/guava-jdk5-13.0.jar", + "type": "binary" + }, + { + "path": "libs-sources/guava-jdk5-13.0-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/guava-jdk5-13.0.jar.properties", + "type": "android-properties" + } + ], + "version": "jdk5-13.0", + "name": "Google Guava", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/gson-2.1.jar", + "type": "binary" + }, + { + "path": "libs-sources/gson-2.1-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/gson-2.1.jar.properties", + "type": "android-properties" + } + ], + "version": "2.1", + "name": "GSON", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/httpclient-4.0.3.jar", + "type": "binary" + }, + { + "path": "libs-sources/httpclient-4.0.3-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "4.0.3", + "name": "HTTP Client", + "environments": [ + "servlet", + "generic" + ] + }, + { + "files": [ + { + "path": "libs/httpcore-4.0.1.jar", + "type": "binary" + }, + { + "path": "libs-sources/httpcore-4.0.1-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "4.0.1", + "name": "HTTP Core", + "environments": [ + "servlet", + "generic" + ] + }, + { + "files": [ + { + "path": "libs/jackson-core-asl-1.9.9.jar", + "type": "binary" + }, + { + "path": "libs-sources/jackson-core-asl-1.9.9-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/jackson-core-asl-1.9.9.jar.properties", + "type": "android-properties" + } + ], + "version": "1.9.9", + "name": "Jackson Core ASL", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/jackson-core-2.0.5.jar", + "type": "binary" + }, + { + "path": "libs-sources/jackson-core-2.0.5-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/jackson-core-2.0.5.jar.properties", + "type": "android-properties" + } + ], + "version": "2.0.5", + "name": "Jackson2 Core", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/jdo2-api-2.3-eb.jar", + "type": "binary" + }, + { + "path": "libs-sources/jdo2-api-2.3-eb-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "2.3-eb", + "name": "JDO2 API", + "environments": [ + "appengine", + "servlet" + ] + }, + { + "files": [ + { + "path": "libs/jetty-6.1.26.jar", + "type": "binary" + }, + { + "path": "libs-sources/jetty-6.1.26-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "6.1.26", + "name": "Jetty", + "environments": [ + "generic" + ] + }, + { + "files": [ + { + "path": "libs/jetty-util-6.1.26.jar", + "type": "binary" + }, + { + "path": "libs-sources/jetty-util-6.1.26-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "6.1.26", + "name": "Jetty Util", + "environments": [ + "generic" + ] + }, + { + "files": [ + { + "path": "libs/jsr305-1.3.9.jar", + "type": "binary" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.3.9", + "name": "JSR 305", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/transaction-api-1.1.jar", + "type": "binary" + }, + { + "path": "libs-sources/transaction-api-1.1-sources.jar", + "type": "source" + }, + { + "path": "dependencies/CDDL-LICENSE.txt", + "type": "license" + } + ], + "version": "1.1", + "name": "Transaction API", + "environments": [ + "appengine", + "servlet" + ] + }, + { + "files": [ + { + "path": "libs/xpp3-1.1.4c.jar", + "type": "binary" + }, + { + "path": "libs-sources/xpp3-1.1.4c-sources.jar", + "type": "source" + }, + { + "path": "dependencies/xpp3_LICENSE.txt", + "type": "license" + } + ], + "version": "1.1.4c", + "name": "XPP3", + "environments": [ + "appengine", + "servlet", + "generic" + ] + } + ], + "proguard-config": "proguard-google-api-client.txt", + "icon_files": { + "x32": "icons/drive_icon_32.png", + "x16": "icons/drive_icon_16.png" + } +} \ No newline at end of file diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/LICENSE.txt b/.google_apis/drive-v2r70lv1.12.0-beta/drive/LICENSE.txt new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/classpath-include b/.google_apis/drive-v2r70lv1.12.0-beta/drive/classpath-include new file mode 100644 index 000000000..d2797b1e4 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/classpath-include @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/BSD-LICENSE.txt b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/BSD-LICENSE.txt new file mode 100644 index 000000000..dcdcc4234 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/BSD-LICENSE.txt @@ -0,0 +1,27 @@ +BSD License + +Copyright (c) 2000-2006, www.hamcrest.org +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. Redistributions in binary form must reproduce +the above copyright notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the distribution. + +Neither the name of Hamcrest nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/css/maven-base.css b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/css/maven-base.css new file mode 100644 index 000000000..f39e42c48 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/css/maven-base.css @@ -0,0 +1,151 @@ +body { + margin: 0px; + padding: 0px; +} +img { + border:none; +} +table { + padding:0px; + width: 100%; + margin-left: -2px; + margin-right: -2px; +} +acronym { + cursor: help; + border-bottom: 1px dotted #feb; +} +table.bodyTable th, table.bodyTable td { + padding: 2px 4px 2px 4px; + vertical-align: top; +} +div.clear{ + clear:both; + visibility: hidden; +} +div.clear hr{ + display: none; +} +#bannerLeft, #bannerRight { + font-size: xx-large; + font-weight: bold; +} +#bannerLeft img, #bannerRight img { + margin: 0px; +} +.xleft, #bannerLeft img { + float:left; +} +.xright, #bannerRight { + float:right; +} +#banner { + padding: 0px; +} +#banner img { + border: none; +} +#breadcrumbs { + padding: 3px 10px 3px 10px; +} +#leftColumn { + width: 170px; + float:left; + overflow: auto; +} +#bodyColumn { + margin-right: 1.5em; + margin-left: 197px; +} +#legend { + padding: 8px 0 8px 0; +} +#navcolumn { + padding: 8px 4px 0 8px; +} +#navcolumn h5 { + margin: 0; + padding: 0; + font-size: small; +} +#navcolumn ul { + margin: 0; + padding: 0; + font-size: small; +} +#navcolumn li { + list-style-type: none; + background-image: none; + background-repeat: no-repeat; + background-position: 0 0.4em; + padding-left: 16px; + list-style-position: outside; + line-height: 1.2em; + font-size: smaller; +} +#navcolumn li.expanded { + background-image: url(../images/expanded.gif); +} +#navcolumn li.collapsed { + background-image: url(../images/collapsed.gif); +} +#poweredBy { + text-align: center; +} +#navcolumn img { + margin-top: 10px; + margin-bottom: 3px; +} +#poweredBy img { + display:block; + margin: 20px 0 20px 17px; +} +#search img { + margin: 0px; + display: block; +} +#search #q, #search #btnG { + border: 1px solid #999; + margin-bottom:10px; +} +#search form { + margin: 0px; +} +#lastPublished { + font-size: x-small; +} +.navSection { + margin-bottom: 2px; + padding: 8px; +} +.navSectionHead { + font-weight: bold; + font-size: x-small; +} +.section { + padding: 4px; +} +#footer { + padding: 3px 10px 3px 10px; + font-size: x-small; +} +#breadcrumbs { + font-size: x-small; + margin: 0pt; +} +.source { + padding: 12px; + margin: 1em 7px 1em 7px; +} +.source pre { + margin: 0px; + padding: 0px; +} +#navcolumn img.imageLink, .imageLink { + padding-left: 0px; + padding-bottom: 0px; + padding-top: 0px; + padding-right: 2px; + border: 0px; + margin: 0px; +} diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/css/maven-theme.css b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/css/maven-theme.css new file mode 100644 index 000000000..ec29c893c --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/css/maven-theme.css @@ -0,0 +1,141 @@ +body { + padding: 0px 0px 10px 0px; +} +body, td, select, input, li{ + font-family: Verdana, Helvetica, Arial, sans-serif; + font-size: 13px; +} +code{ + font-family: Courier, monospace; + font-size: 13px; +} +a { + text-decoration: none; +} +a:link { + color:#36a; +} +a:visited { + color:#47a; +} +a:active, a:hover { + color:#69c; +} +#legend li.externalLink { + background: url(../images/external.png) left top no-repeat; + padding-left: 18px; +} +a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover { + background: url(../images/external.png) right center no-repeat; + padding-right: 18px; +} +#legend li.newWindow { + background: url(../images/newwindow.png) left top no-repeat; + padding-left: 18px; +} +a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover { + background: url(../images/newwindow.png) right center no-repeat; + padding-right: 18px; +} +h2 { + padding: 4px 4px 4px 6px; + border: 1px solid #999; + color: #900; + background-color: #ddd; + font-weight:900; + font-size: x-large; +} +h3 { + padding: 4px 4px 4px 6px; + border: 1px solid #aaa; + color: #900; + background-color: #eee; + font-weight: normal; + font-size: large; +} +h4 { + padding: 4px 4px 4px 6px; + border: 1px solid #bbb; + color: #900; + background-color: #fff; + font-weight: normal; + font-size: large; +} +h5 { + padding: 4px 4px 4px 6px; + color: #900; + font-size: normal; +} +p { + line-height: 1.3em; + font-size: small; +} +#breadcrumbs { + border-top: 1px solid #aaa; + border-bottom: 1px solid #aaa; + background-color: #ccc; +} +#leftColumn { + margin: 10px 0 0 5px; + border: 1px solid #999; + background-color: #eee; +} +#navcolumn h5 { + font-size: smaller; + border-bottom: 1px solid #aaaaaa; + padding-top: 2px; + color: #000; +} + +table.bodyTable th { + color: white; + background-color: #bbb; + text-align: left; + font-weight: bold; +} + +table.bodyTable th, table.bodyTable td { + font-size: 1em; +} + +table.bodyTable tr.a { + background-color: #ddd; +} + +table.bodyTable tr.b { + background-color: #eee; +} + +.source { + border: 1px solid #999; +} +dl { + padding: 4px 4px 4px 6px; + border: 1px solid #aaa; + background-color: #ffc; +} +dt { + color: #900; +} +#organizationLogo img, #projectLogo img, #projectLogo span{ + margin: 8px; +} +#banner { + border-bottom: 1px solid #fff; +} +.errormark, .warningmark, .donemark, .infomark { + background: url(../images/icon_error_sml.gif) no-repeat; +} + +.warningmark { + background-image: url(../images/icon_warning_sml.gif); +} + +.donemark { + background-image: url(../images/icon_success_sml.gif); +} + +.infomark { + background-image: url(../images/icon_info_sml.gif); +} + diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/css/print.css b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/css/print.css new file mode 100644 index 000000000..a5e7bd95f --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/css/print.css @@ -0,0 +1,7 @@ +#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn { + display: none !important; +} +#bodyColumn, body.docs div.docs { + margin: 0 !important; + border: none !important +} diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/css/site.css b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/css/site.css new file mode 100644 index 000000000..055e7e286 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/css/site.css @@ -0,0 +1 @@ +/* You can override this file with your own styles */ \ No newline at end of file diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/dependencies.html b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/dependencies.html new file mode 100644 index 000000000..0e426225c --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/dependencies.html @@ -0,0 +1,110 @@ + + + + + + Project Dependencies + + + + + + + + + +
+ +
+
+
+

Project Dependencies

compile

The following is a list of compile dependencies for this project. These dependencies are required to compile and run the application:

GroupIdArtifactIdVersionTypeLicense
com.google.api-clientgoogle-api-client1.12.0-betajarThe Apache Software License, Version 2.0

Project Transitive Dependencies

The following is a list of transitive dependencies for this project. Transitive dependencies are the dependencies of the project dependencies.

compile

The following is a list of compile dependencies for this project. These dependencies are required to compile and run the application:

GroupIdArtifactIdVersionTypeLicense
com.google.androidandroid1.5_r4jarApache 2.0
com.google.code.findbugsjsr3051.3.9jarThe Apache Software License, Version 2.0
com.google.code.gsongson2.1jarThe Apache Software License, Version 2.0
com.google.guavaguava11.0.1jarThe Apache Software License, Version 2.0
com.google.http-clientgoogle-http-client1.12.0-betajarThe Apache Software License, Version 2.0
com.google.oauth-clientgoogle-oauth-client1.12.0-betajarThe Apache Software License, Version 2.0
com.google.protobufprotobuf-java2.2.0jarNew BSD license
commons-codeccommons-codec1.6jarThe Apache Software License, Version 2.0
commons-loggingcommons-logging1.1.1jarThe Apache Software License, Version 2.0
junitjunit4.8.2jarCommon Public License Version 1.0
org.apache.httpcomponentshttpclient4.0.3jar../LICENSE.txt
org.apache.httpcomponentshttpcore4.0.1jarApache License
org.codehaus.jacksonjackson-core-asl1.9.4jarThe Apache Software License, Version 2.0
org.khronosopengl-apigl1.1-android-2.1_r1jarApache 2.0
xercesxmlParserAPIs2.6.2jar-
xpp3xpp31.1.4cjarIndiana University Extreme! Lab Software License, vesion 1.1.1-Public Domain-Apache Software License, version 1.1

Project Dependency Graph

+

Dependency Tree

Licenses

Apache Software License, version 1.1: MXP1: Xml Pull Parser 3rd Edition (XPP3)

Public Domain: MXP1: Xml Pull Parser 3rd Edition (XPP3)

Unknown: xmlParserAPIs

Apache License: HttpClient, HttpCore

New BSD license: Protocol Buffer Java API

Common Public License Version 1.0: JUnit

Apache 2.0: Google Android Java ME Library (Khronos), Google Android Library

The Apache Software License, Version 2.0: Drive API v2, Commons Codec, Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Gson, Guava: Google Core Libraries for Java, Jackson

Indiana University Extreme! Lab Software License, vesion 1.1.1: MXP1: Xml Pull Parser 3rd Edition (XPP3)

Dependency File Details

FilenameSizeEntriesClassesPackagesJDK RevDebug
android-1.5_r4.jar2.04 MB1,894965411.5debug
google-api-client-1.12.0-beta.jar76.92 kB775691.5debug
jsr305-1.3.9.jar32.24 kB723531.5debug
gson-2.1.jar175.89 kB15814861.5debug
guava-11.0.1.jar1.57 MB1,2901,267121.5debug
google-http-client-1.12.0-beta.jar234.84 kB207177181.5debug
google-oauth-client-1.12.0-beta.jar76.02 kB836571.5debug
protobuf-java-2.2.0.jar312.80 kB15614611.5debug
commons-codec-1.6.jar227.32 kB2187661.5debug
commons-logging-1.1.1.jar59.26 kB422821.1debug
junit-4.8.2.jar231.78 kB267230301.5debug
httpclient-4.0.3.jar286.03 kB267231221.5debug
httpcore-4.0.1.jar168.84 kB181158101.3debug
jackson-core-asl-1.9.4.jar222.96 kB13612081.5debug
opengl-api-gl1.1-android-2.1_r1.jar18.06 kB251321.5debug
xmlParserAPIs-2.6.2.jar121.80 kB238207171.1release
xpp3-1.1.4c.jar117.25 kB7856131.1debug
TotalSizeEntriesClassesPackagesJDK RevDebug
175.92 MB5,3893,9782071.516
compile: 17compile: 5.92 MBcompile: 5,389compile: 3,978compile: 207-compile: 16

Dependency Repository Locations

Repo IDURLReleaseSnapshot
apache.snapshotshttp://people.apache.org/repo/m2-snapshot-repository-Yes-
google-api-serviceshttp://mavenrepo.google-api-java-client.googlecode.com/hg-Yes-
sonatype-nexus-snapshotshttps://oss.sonatype.org/content/repositories/snapshots-Yes-
centralhttp://repo1.maven.org/maven2Yes--

Repository locations for each of the Dependencies.

Artifactapache.snapshotsgoogle-api-servicessonatype-nexus-snapshotscentral
com.google.android:android:jar:1.5_r4---Found at http://repo1.maven.org/maven2
com.google.api-client:google-api-client:jar:1.12.0-beta---Found at http://repo1.maven.org/maven2
com.google.code.findbugs:jsr305:jar:1.3.9---Found at http://repo1.maven.org/maven2
com.google.code.gson:gson:jar:2.1---Found at http://repo1.maven.org/maven2
com.google.guava:guava:jar:11.0.1---Found at http://repo1.maven.org/maven2
com.google.http-client:google-http-client:jar:1.12.0-beta---Found at http://repo1.maven.org/maven2
com.google.oauth-client:google-oauth-client:jar:1.12.0-beta---Found at http://repo1.maven.org/maven2
com.google.protobuf:protobuf-java:jar:2.2.0---Found at http://repo1.maven.org/maven2
commons-codec:commons-codec:jar:1.6---Found at http://repo1.maven.org/maven2
commons-logging:commons-logging:jar:1.1.1---Found at http://repo1.maven.org/maven2
junit:junit:jar:4.8.2---Found at http://repo1.maven.org/maven2
org.apache.httpcomponents:httpclient:jar:4.0.3---Found at http://repo1.maven.org/maven2
org.apache.httpcomponents:httpcore:jar:4.0.1---Found at http://repo1.maven.org/maven2
org.codehaus.jackson:jackson-core-asl:jar:1.9.4---Found at http://repo1.maven.org/maven2
org.khronos:opengl-api:jar:gl1.1-android-2.1_r1---Found at http://repo1.maven.org/maven2
xerces:xmlParserAPIs:jar:2.6.2---Found at http://repo1.maven.org/maven2
xpp3:xpp3:jar:1.1.4c---Found at http://repo1.maven.org/maven2
Totalapache.snapshotsgoogle-api-servicessonatype-nexus-snapshotscentral
17 (compile: 17)00017
+
+
+
+
+
+ + + diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/close.gif b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/close.gif new file mode 100644 index 000000000..1c26bbc52 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/close.gif differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/collapsed.gif b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/collapsed.gif new file mode 100644 index 000000000..6e7108406 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/collapsed.gif differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/expanded.gif b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/expanded.gif new file mode 100644 index 000000000..0fef3d89e Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/expanded.gif differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/external.png b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/external.png new file mode 100644 index 000000000..3f999fc88 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/external.png differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/icon_error_sml.gif b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/icon_error_sml.gif new file mode 100644 index 000000000..61132ef2b Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/icon_error_sml.gif differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/icon_info_sml.gif b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/icon_info_sml.gif new file mode 100644 index 000000000..c6cb9ad7c Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/icon_info_sml.gif differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/icon_success_sml.gif b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/icon_success_sml.gif new file mode 100644 index 000000000..52e85a430 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/icon_success_sml.gif differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/icon_warning_sml.gif b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/icon_warning_sml.gif new file mode 100644 index 000000000..873bbb52c Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/icon_warning_sml.gif differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/logos/build-by-maven-black.png b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/logos/build-by-maven-black.png new file mode 100644 index 000000000..919fd0f66 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/logos/build-by-maven-black.png differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/logos/build-by-maven-white.png b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/logos/build-by-maven-white.png new file mode 100644 index 000000000..7d44c9c2e Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/logos/build-by-maven-white.png differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/logos/maven-feather.png b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/logos/maven-feather.png new file mode 100644 index 000000000..b5ada836e Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/logos/maven-feather.png differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/newwindow.png b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/newwindow.png new file mode 100644 index 000000000..6287f72bd Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/dependencies/images/newwindow.png differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/descriptor.json b/.google_apis/drive-v2r70lv1.12.0-beta/drive/descriptor.json new file mode 100644 index 000000000..0ad589e89 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/descriptor.json @@ -0,0 +1,705 @@ +{ + "discoveryLink": "./apis/drive/v2/rest", + "kind": "discovery#directoryItem", + "description": "The API to interact with Drive.", + "title": "Drive API", + "discoveryRestUrl": "https://www.googleapis.com/discovery/v1/apis/drive/v2/rest", + "preferred": true, + "version": "v2", + "icons": { + "x32": "https://ssl.gstatic.com/docs/doclist/images/drive_icon_32.png", + "x16": "https://ssl.gstatic.com/docs/doclist/images/drive_icon_16.png" + }, + "documentationLink": "https://developers.google.com/drive/", + "id": "drive:v2", + "name": "drive", + "packagePath": null, + "canonicalName": null, + "files": [ + { + "downloadUrl": "/downloads/drive/v2/70/java/1.12.0-beta/google-api-services-drive-v2-rev70-1.12.0-beta.jar", + "path": "google-api-services-drive-v2-rev70-1.12.0-beta.jar", + "type": "binary", + "timestamp": "2013-04-17 06:10" + }, + { + "downloadUrl": "/downloads/drive/v2/70/java/1.12.0-beta/google-api-services-drive-v2-rev70-1.12.0-beta-javadoc.jar", + "path": "google-api-services-drive-v2-rev70-1.12.0-beta-javadoc.jar", + "type": "documentation", + "timestamp": "2013-04-17 06:10" + }, + { + "downloadUrl": "/downloads/drive/v2/70/java/1.12.0-beta/google-api-services-drive-v2-rev70-1.12.0-beta-sources.jar", + "path": "google-api-services-drive-v2-rev70-1.12.0-beta-sources.jar", + "type": "source", + "timestamp": "2013-04-17 06:10" + }, + { + "path": "google-api-services-drive-v2-rev70-1.12.0-beta.jar.properties", + "type": "android.properties" + } + ], + "revision": 70, + "language": "java", + "language_version": "1.12.0-beta", + "dependencies": [ + { + "files": [ + { + "downloadUrl": "http://google-api-java-client.googlecode.com/files/google-api-java-client-1.12.0-beta.zip", + "type": "bundle" + } + ], + "version": "1.12.0-beta", + "name": "Google API Java Client Bundle", + "environments": [ + "manual" + ] + }, + { + "files": [ + { + "path": "libs/google-api-client-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-api-client-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-api-client-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Google APIs Client Library", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/google-api-client-android-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-api-client-android-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-api-client-android-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Android platform extensions to the Google APIs Client Library", + "environments": [ + "android" + ] + }, + { + "files": [ + { + "path": "libs/google-api-client-appengine-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-api-client-appengine-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Google App Engine extensions to the Google APIs Client Library", + "environments": [ + "appengine" + ] + }, + { + "files": [ + { + "path": "libs/google-api-client-java6-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-api-client-java6-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Java 6 (and higher) extensions to the Google APIs Client Library", + "environments": [ + "generic" + ] + }, + { + "files": [ + { + "path": "libs/google-oauth-client-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-oauth-client-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-oauth-client-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Google OAuth Client Library", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/google-oauth-client-appengine-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-oauth-client-appengine-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Google App Engine extensions to the Google OAuth Client Library", + "environments": [ + "appengine" + ] + }, + { + "files": [ + { + "path": "libs/google-oauth-client-java6-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-oauth-client-java6-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Java 6 (and higher) extensions to the Google OAuth Client Library", + "environments": [ + "generic" + ] + }, + { + "files": [ + { + "path": "libs/google-oauth-client-jetty-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-oauth-client-jetty-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Jetty extensions to the Google OAuth Client Library", + "environments": [ + "generic" + ] + }, + { + "files": [ + { + "path": "libs/google-oauth-client-servlet-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-oauth-client-servlet-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Servlet and JDO extensions to the Google OAuth Client Library", + "environments": [ + "appengine", + "servlet" + ] + }, + { + "files": [ + { + "path": "libs/google-http-client-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-http-client-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-http-client-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Google HTTP Client Library", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/google-http-client-android-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-http-client-android-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-http-client-android-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Android platform extensions to the Google HTTP Client Library", + "environments": [ + "android" + ] + }, + { + "files": [ + { + "path": "libs/google-http-client-appengine-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-http-client-appengine-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.12.0-beta", + "name": "Google App Engine extensions to the Google HTTP Client Library", + "environments": [ + "appengine" + ] + }, + { + "files": [ + { + "path": "libs/google-http-client-gson-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-http-client-gson-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-http-client-gson-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "GSON extensions to the Google HTTP Client Library", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/google-http-client-jackson-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-http-client-jackson-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-http-client-jackson-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Jackson extensions to the Google HTTP Client Library", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/google-http-client-jackson2-1.12.0-beta.jar", + "type": "binary" + }, + { + "path": "libs-sources/google-http-client-jackson2-1.12.0-beta-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/google-http-client-jackson2-1.12.0-beta.jar.properties", + "type": "android-properties" + } + ], + "version": "1.12.0-beta", + "name": "Jackson 2 extensions to the Google HTTP Client Library", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/commons-logging-1.1.1.jar", + "type": "binary" + }, + { + "path": "libs-sources/commons-logging-1.1.1-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.1.1", + "name": "Commons Logging", + "environments": [ + "servlet", + "generic" + ] + }, + { + "files": [ + { + "path": "libs/guava-jdk5-13.0.jar", + "type": "binary" + }, + { + "path": "libs-sources/guava-jdk5-13.0-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/guava-jdk5-13.0.jar.properties", + "type": "android-properties" + } + ], + "version": "jdk5-13.0", + "name": "Google Guava", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/gson-2.1.jar", + "type": "binary" + }, + { + "path": "libs-sources/gson-2.1-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/gson-2.1.jar.properties", + "type": "android-properties" + } + ], + "version": "2.1", + "name": "GSON", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/httpclient-4.0.3.jar", + "type": "binary" + }, + { + "path": "libs-sources/httpclient-4.0.3-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "4.0.3", + "name": "HTTP Client", + "environments": [ + "servlet", + "generic" + ] + }, + { + "files": [ + { + "path": "libs/httpcore-4.0.1.jar", + "type": "binary" + }, + { + "path": "libs-sources/httpcore-4.0.1-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "4.0.1", + "name": "HTTP Core", + "environments": [ + "servlet", + "generic" + ] + }, + { + "files": [ + { + "path": "libs/jackson-core-asl-1.9.9.jar", + "type": "binary" + }, + { + "path": "libs-sources/jackson-core-asl-1.9.9-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/jackson-core-asl-1.9.9.jar.properties", + "type": "android-properties" + } + ], + "version": "1.9.9", + "name": "Jackson Core ASL", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/jackson-core-2.0.5.jar", + "type": "binary" + }, + { + "path": "libs-sources/jackson-core-2.0.5-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + }, + { + "path": "libs/jackson-core-2.0.5.jar.properties", + "type": "android-properties" + } + ], + "version": "2.0.5", + "name": "Jackson2 Core", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/jdo2-api-2.3-eb.jar", + "type": "binary" + }, + { + "path": "libs-sources/jdo2-api-2.3-eb-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "2.3-eb", + "name": "JDO2 API", + "environments": [ + "appengine", + "servlet" + ] + }, + { + "files": [ + { + "path": "libs/jetty-6.1.26.jar", + "type": "binary" + }, + { + "path": "libs-sources/jetty-6.1.26-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "6.1.26", + "name": "Jetty", + "environments": [ + "generic" + ] + }, + { + "files": [ + { + "path": "libs/jetty-util-6.1.26.jar", + "type": "binary" + }, + { + "path": "libs-sources/jetty-util-6.1.26-sources.jar", + "type": "source" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "6.1.26", + "name": "Jetty Util", + "environments": [ + "generic" + ] + }, + { + "files": [ + { + "path": "libs/jsr305-1.3.9.jar", + "type": "binary" + }, + { + "path": "dependencies/APACHE-LICENSE.txt", + "type": "license" + } + ], + "version": "1.3.9", + "name": "JSR 305", + "environments": [ + "*" + ] + }, + { + "files": [ + { + "path": "libs/transaction-api-1.1.jar", + "type": "binary" + }, + { + "path": "libs-sources/transaction-api-1.1-sources.jar", + "type": "source" + }, + { + "path": "dependencies/CDDL-LICENSE.txt", + "type": "license" + } + ], + "version": "1.1", + "name": "Transaction API", + "environments": [ + "appengine", + "servlet" + ] + }, + { + "files": [ + { + "path": "libs/xpp3-1.1.4c.jar", + "type": "binary" + }, + { + "path": "libs-sources/xpp3-1.1.4c-sources.jar", + "type": "source" + }, + { + "path": "dependencies/xpp3_LICENSE.txt", + "type": "license" + } + ], + "version": "1.1.4c", + "name": "XPP3", + "environments": [ + "appengine", + "servlet", + "generic" + ] + } + ], + "proguard-config": "proguard-google-api-client.txt", + "icon_files": { + "x32": "icons/drive_icon_32.png", + "x16": "icons/drive_icon_16.png" + } +} \ No newline at end of file diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/google-api-services-drive-v2-rev70-1.12.0-beta-javadoc.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/google-api-services-drive-v2-rev70-1.12.0-beta-javadoc.jar new file mode 100644 index 000000000..225192386 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/google-api-services-drive-v2-rev70-1.12.0-beta-javadoc.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/google-api-services-drive-v2-rev70-1.12.0-beta-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/google-api-services-drive-v2-rev70-1.12.0-beta-sources.jar new file mode 100644 index 000000000..ad3000619 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/google-api-services-drive-v2-rev70-1.12.0-beta-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/google-api-services-drive-v2-rev70-1.12.0-beta.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/google-api-services-drive-v2-rev70-1.12.0-beta.jar new file mode 100644 index 000000000..3fa8d140e Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/google-api-services-drive-v2-rev70-1.12.0-beta.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/google-api-services-drive-v2-rev70-1.12.0-beta.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/google-api-services-drive-v2-rev70-1.12.0-beta.jar.properties new file mode 100644 index 000000000..9fe7f648a --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/google-api-services-drive-v2-rev70-1.12.0-beta.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/google-api-services-drive-v2-rev70-1.12.0-beta-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/icons/drive_icon_16.png b/.google_apis/drive-v2r70lv1.12.0-beta/drive/icons/drive_icon_16.png new file mode 100644 index 000000000..17937dec0 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/icons/drive_icon_16.png differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/icons/drive_icon_32.png b/.google_apis/drive-v2r70lv1.12.0-beta/drive/icons/drive_icon_32.png new file mode 100644 index 000000000..43b646694 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/icons/drive_icon_32.png differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-api-client-1.12.0-beta-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-api-client-1.12.0-beta-sources.jar new file mode 100644 index 000000000..6c8d980d6 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-api-client-1.12.0-beta-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-api-client-android-1.12.0-beta-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-api-client-android-1.12.0-beta-sources.jar new file mode 100644 index 000000000..16934a51d Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-api-client-android-1.12.0-beta-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-1.12.0-beta-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-1.12.0-beta-sources.jar new file mode 100644 index 000000000..4507e0a21 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-1.12.0-beta-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-android-1.12.0-beta-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-android-1.12.0-beta-sources.jar new file mode 100644 index 000000000..7ce36e594 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-android-1.12.0-beta-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-gson-1.12.0-beta-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-gson-1.12.0-beta-sources.jar new file mode 100644 index 000000000..168df18ae Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-gson-1.12.0-beta-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-jackson-1.12.0-beta-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-jackson-1.12.0-beta-sources.jar new file mode 100644 index 000000000..377c1dea9 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-jackson-1.12.0-beta-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-jackson2-1.12.0-beta-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-jackson2-1.12.0-beta-sources.jar new file mode 100644 index 000000000..442a357e2 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-http-client-jackson2-1.12.0-beta-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-oauth-client-1.12.0-beta-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-oauth-client-1.12.0-beta-sources.jar new file mode 100644 index 000000000..bd82679dd Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/google-oauth-client-1.12.0-beta-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/gson-2.1-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/gson-2.1-sources.jar new file mode 100644 index 000000000..09396a02e Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/gson-2.1-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/guava-jdk5-13.0-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/guava-jdk5-13.0-sources.jar new file mode 100644 index 000000000..c5ee71697 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/guava-jdk5-13.0-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/jackson-core-2.0.5-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/jackson-core-2.0.5-sources.jar new file mode 100644 index 000000000..af5dc6e4d Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/jackson-core-2.0.5-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/jackson-core-asl-1.9.9-sources.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/jackson-core-asl-1.9.9-sources.jar new file mode 100644 index 000000000..af5dc6e4d Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs-sources/jackson-core-asl-1.9.9-sources.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-api-client-1.12.0-beta.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-api-client-1.12.0-beta.jar new file mode 100644 index 000000000..c85862626 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-api-client-1.12.0-beta.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-api-client-1.12.0-beta.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-api-client-1.12.0-beta.jar.properties new file mode 100644 index 000000000..39c242523 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-api-client-1.12.0-beta.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/google-api-client-1.12.0-beta-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-api-client-android-1.12.0-beta.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-api-client-android-1.12.0-beta.jar new file mode 100644 index 000000000..cb7cfe8bc Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-api-client-android-1.12.0-beta.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-api-client-android-1.12.0-beta.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-api-client-android-1.12.0-beta.jar.properties new file mode 100644 index 000000000..31042993d --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-api-client-android-1.12.0-beta.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/google-api-client-android-1.12.0-beta-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-1.12.0-beta.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-1.12.0-beta.jar new file mode 100644 index 000000000..6ff05049f Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-1.12.0-beta.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-1.12.0-beta.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-1.12.0-beta.jar.properties new file mode 100644 index 000000000..22d7a272a --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-1.12.0-beta.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/google-http-client-1.12.0-beta-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-android-1.12.0-beta.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-android-1.12.0-beta.jar new file mode 100644 index 000000000..1ed253346 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-android-1.12.0-beta.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-android-1.12.0-beta.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-android-1.12.0-beta.jar.properties new file mode 100644 index 000000000..b804cc361 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-android-1.12.0-beta.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/google-http-client-android-1.12.0-beta-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-gson-1.12.0-beta.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-gson-1.12.0-beta.jar new file mode 100644 index 000000000..7a2e064e7 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-gson-1.12.0-beta.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-gson-1.12.0-beta.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-gson-1.12.0-beta.jar.properties new file mode 100644 index 000000000..3cdc720ab --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-gson-1.12.0-beta.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/google-http-client-gson-1.12.0-beta-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-jackson-1.12.0-beta.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-jackson-1.12.0-beta.jar new file mode 100644 index 000000000..52c2209d9 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-jackson-1.12.0-beta.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-jackson-1.12.0-beta.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-jackson-1.12.0-beta.jar.properties new file mode 100644 index 000000000..0f06bb8c3 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-jackson-1.12.0-beta.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/google-http-client-jackson-1.12.0-beta-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-jackson2-1.12.0-beta.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-jackson2-1.12.0-beta.jar new file mode 100644 index 000000000..9415c7b23 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-jackson2-1.12.0-beta.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-jackson2-1.12.0-beta.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-jackson2-1.12.0-beta.jar.properties new file mode 100644 index 000000000..c70f7d815 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-http-client-jackson2-1.12.0-beta.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/google-http-client-jackson2-1.12.0-beta-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-oauth-client-1.12.0-beta.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-oauth-client-1.12.0-beta.jar new file mode 100644 index 000000000..dad2abe4f Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-oauth-client-1.12.0-beta.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-oauth-client-1.12.0-beta.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-oauth-client-1.12.0-beta.jar.properties new file mode 100644 index 000000000..d8ef90d84 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/google-oauth-client-1.12.0-beta.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/google-oauth-client-1.12.0-beta-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/gson-2.1.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/gson-2.1.jar new file mode 100644 index 000000000..83c5c994b Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/gson-2.1.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/gson-2.1.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/gson-2.1.jar.properties new file mode 100644 index 000000000..cfa21515f --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/gson-2.1.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/gson-2.1-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/guava-jdk5-13.0.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/guava-jdk5-13.0.jar new file mode 100644 index 000000000..85881e5de Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/guava-jdk5-13.0.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/guava-jdk5-13.0.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/guava-jdk5-13.0.jar.properties new file mode 100644 index 000000000..415299133 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/guava-jdk5-13.0.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/guava-jdk5-13.0-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jackson-core-2.0.5.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jackson-core-2.0.5.jar new file mode 100644 index 000000000..51d1fdeb4 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jackson-core-2.0.5.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jackson-core-2.0.5.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jackson-core-2.0.5.jar.properties new file mode 100644 index 000000000..8ceae8ed1 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jackson-core-2.0.5.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/jackson-core-2.0.5-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jackson-core-asl-1.9.9.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jackson-core-asl-1.9.9.jar new file mode 100644 index 000000000..d75843d1c Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jackson-core-asl-1.9.9.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jackson-core-asl-1.9.9.jar.properties b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jackson-core-asl-1.9.9.jar.properties new file mode 100644 index 000000000..53aca9d0d --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jackson-core-asl-1.9.9.jar.properties @@ -0,0 +1 @@ +src=../libs-sources/jackson-core-asl-1.9.9-sources.jar diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jsr305-1.3.9.jar b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jsr305-1.3.9.jar new file mode 100644 index 000000000..a9afc6619 Binary files /dev/null and b/.google_apis/drive-v2r70lv1.12.0-beta/drive/libs/jsr305-1.3.9.jar differ diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/proguard-google-api-client.txt b/.google_apis/drive-v2r70lv1.12.0-beta/drive/proguard-google-api-client.txt new file mode 100644 index 000000000..ca7616a58 --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/proguard-google-api-client.txt @@ -0,0 +1,25 @@ +# ProGuard Configuration file +# +# See http://proguard.sourceforge.net/index.html#manual/usage.html + +# Needed to keep generic types and @Key annotations accessed via reflection + +-keepattributes Signature,RuntimeVisibleAnnotations,AnnotationDefault + +-keepclassmembers class * { + @com.google.api.client.util.Key ; +} + +# Needed by Guava +# See https://groups.google.com/forum/#!topic/guava-discuss/YCZzeCiIVoI + +-dontwarn sun.misc.Unsafe +-dontwarn com.google.common.collect.MinMaxPriorityQueue + +# Needed by google-http-client-android when linking against an older platform version + +-dontwarn com.google.api.client.extensions.android.** + +# Needed by google-api-client-android when linking against an older platform version + +-dontwarn com.google.api.client.googleapis.extensions.android.** diff --git a/.google_apis/drive-v2r70lv1.12.0-beta/drive/readme.html b/.google_apis/drive-v2r70lv1.12.0-beta/drive/readme.html new file mode 100644 index 000000000..a604d7c7b --- /dev/null +++ b/.google_apis/drive-v2r70lv1.12.0-beta/drive/readme.html @@ -0,0 +1,158 @@ + +Drive API v2 Client Library for Java + +

Drive API v2 Client Library for Java

+ +

Overview

+

High-level details about this library can be found at +http://code.google.com/p/google-api-java-client +

+ +

License

+The license can be found here.
+ +

Generated service-specific Library

+The generated service-specific library can be found in the top level directory +of the zip file: +google-api-services-drive-v2-rev70-1.12.0-beta.jar + +

Maven Usage

+Maven users can specify the service-specific generated library in their +project's plugin configuration: +
+<repositories>
+  <repository>
+    <id>googleapis</id>
+    <url>http://mavenrepo.google-api-java-client.googlecode.com/hg/</url>
+  </repository>
+</repositories>
+
+<dependency>
+  <groupId>com.google.apis</groupId>
+  <artifactId>google-api-services-drive</artifactId>
+  <version>v2-rev70-1.12.0-beta</version>
+</dependency>
+
+ + +

Eclipse

+A .classpath file snippet that can be included in your project's .classpath has been provided here. +Please only use the classpathentry's you actually need (see below for details). + +

ProGuard

+A ProGuard configuration file proguard-google-api-client.txt +is included for common settings for using the library. On Android projects, you may want to add a reference to +proguard-google-api-client.txt in the project.properties file under the +proguard.config property. + +

Dependencies

+

+Dependent jars for +google-api-services-drive-v2-rev70-1.12.0-beta.jar +can be found in the libs folder and the corresponding source +jars can be found in the libs-sources folder. +

+The dependency structure and licenses can be found in +dependencies.html. +

+ +

Dependencies for all Platforms

+The following are the jars from the libs folder required for +applications on all platforms: +
    +
  • google-api-client-1.12.0-beta.jar
    • +
  • google-oauth-client-1.12.0-beta.jar
    • +
  • google-http-client-1.12.0-beta.jar
    • +
  • guava-jdk5-13.0.jar
    • +
  • jsr305-1.3.9.jar
    • +
  • google-http-client-gson-1.12.0-beta.jar (when using GSON) +
      +
    • gson-2.1.jar
      • +
    +
    • +
  • google-http-client-jackson-1.12.0-beta.jar (when using Jackson) +
      +
    • jackson-core-asl-1.9.9.jar
      • +
    +
    • +
  • google-http-client-jackson2-1.12.0-beta.jar (when using Jackson 2) +
      +
    • jackson-core-$2.0.5.jar
      • +
    +
    • +
+ +

Android Dependencies

+The following are the jars from the libs folder required for +android applications or a newer compatible version of each dependency: +
    +
  • google-api-client-android-1.12.0-beta.jar (for SDK >= 2.1)
    • +
  • google-http-client-android-1.12.0-beta.jar (for SDK >= 2.1)
    • +
  • [deprecated] google-api-client-android2-1.12.0-beta.jar (for SDK >= 2.1)
    • +
  • [deprecated] google-http-client-android2-1.12.0-beta.jar (for SDK >= 2.1)
    • +
  • [deprecated] google-http-client-android3-1.12.0-beta.jar (for SDK >= 3.0)
    • +
+libs folder also contains properties files that specify the location of source +jars for Android projects in Eclipse.
+Please see the +Android wiki +for the Android Developer's Guide. + +

Google App Engine Dependencies

+The following are the jars from the libs folder required for +Google App Engine applications or a newer compatible version of each dependency: +
    +
  • google-api-client-appengine-1.12.0-beta.jar
    • +
  • google-oauth-client-appengine-1.12.0-beta.jar
    • +
  • google-oauth-client-servlet-1.12.0-beta.jar
    • +
  • google-http-client-appengine-1.12.0-beta.jar
    • +
  • jdo2-api-2.3-eb.jar
    • +
  • transaction-api-1.1.jar
    • +
  • xpp3-1.1.4c.jar
    • +
+Please see the +GoogleAppEngine wiki +for the Google App Engine Developer's Guide. + +

Servlet Dependencies

+The following are the jars from the libs folder required for +Servlet applications or a newer compatible version of each dependency: +
    +
  • google-oauth-client-1.12.0-beta.jar
    • +
  • google-oauth-client-servlet-1.12.0-beta.jar
    • +
  • commons-logging-1.1.1.jar
    • +
  • httpclient-4.0.3.jar
    • +
  • httpcore-4.0.1.jar
    • +
  • jdo2-api-2.3-eb.jar
    • +
  • transaction-api-1.1.jar
    • +
  • xpp3-1.1.4c.jar
    • +
+ +

General Purpose Java 5 Environment Dependencies

+The following are the jars from the libs folder required for +general purpose Java 5 applications (or a newer compatible version of each dependency): +
    +
  • google-api-client-java6-1.12.0-beta.jar
    • +
  • google-oauth-client-java6-1.12.0-beta.jar
    • +
      +
    • google-oauth-client-jetty-${project.oauth.version}.jar (for Jetty 6) +
        +
      • jetty-${jettyVersion}
        • +
      • jetty-util-${jettyUtilVersion}
        • +
      +
      • +
    +
  • commons-logging-1.1.1.jar
    • +
  • httpclient-4.0.3.jar
    • +
  • httpcore-4.0.1.jar
    • +
  • xpp3-1.1.4c.jar
    • +
+ + + + diff --git a/.settings/com.google.gdt.eclipse.managedapis.prefs b/.settings/com.google.gdt.eclipse.managedapis.prefs new file mode 100644 index 000000000..bca0ae043 --- /dev/null +++ b/.settings/com.google.gdt.eclipse.managedapis.prefs @@ -0,0 +1,2 @@ +COPY_CLASSPATH_ENTRIES_TARGET_PATH=libs +eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..b080d2ddc --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a310edc05..86308a8f1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ - + + + + + + + + + + + + + + + + + diff --git a/README b/README index fbd5dee68..2d1e6e10e 100644 --- a/README +++ b/README @@ -5,3 +5,8 @@ Native library build instructions: 2. From KeePassDroid/jni, call prep_build.sh to download and unpack the crypto sources. 3. From the KeePassDroid root directory, call ${path-to-ndk}/ndk-build + +Google Drive Integration build instructions: +To add the google drive dependency in eclipse after installing the google plugin, right click on the project and choose Google->Add Google APIs then choose Drive (v2) + +To add the google-play-services dependency, either refer to the project in the Android SDK samples or unzip the included zip file (google-play-services_lib) and then modify the KeePass project to reference the google-play-services as an Android library. \ No newline at end of file diff --git a/google-play-services_lib.zip b/google-play-services_lib.zip new file mode 100644 index 000000000..e357d7ef6 Binary files /dev/null and b/google-play-services_lib.zip differ diff --git a/google_drive_adapter.diff b/google_drive_adapter.diff new file mode 100644 index 000000000..c2920a8c0 --- /dev/null +++ b/google_drive_adapter.diff @@ -0,0 +1,204 @@ +diff --git a/.classpath b/.classpath +index dec02b3..18e6c1b 100644 +--- a/.classpath ++++ b/.classpath +@@ -1,9 +1,11 @@ + + ++ + + + +- + ++ ++ + + +diff --git a/AndroidManifest.xml b/AndroidManifest.xml +index a310edc..86308a8 100644 +--- a/AndroidManifest.xml ++++ b/AndroidManifest.xml +@@ -2,7 +2,7 @@ + +- ++ + + + ++ ++ ++ ++ ++ ++ ++ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +diff --git a/project.properties b/project.properties +index adea83f..6f54e24 100644 +--- a/project.properties ++++ b/project.properties +@@ -10,5 +10,6 @@ + # Indicates whether an apk should be generated for each density. + split.density=false + # Project target. +-target=android-11 ++target=Google Inc.:Google APIs:17 + apk-configurations= ++android.library.reference.1=../google-play-services_lib +diff --git a/src/com/keepassdroid/Database.java b/src/com/keepassdroid/Database.java +index fce874b..bdaf07c 100644 +--- a/src/com/keepassdroid/Database.java ++++ b/src/com/keepassdroid/Database.java +@@ -156,6 +156,11 @@ public class Database { + + mFilename = filename; + ++ //Required for Google Drive Integration ++ if(googleDriveAdapter != null) { ++ googleDriveAdapter.update(orig); ++ } ++ + } + + public void clear() { +@@ -180,4 +185,10 @@ public class Database { + } + + ++ //Required for Google Drive Integration ++ private GoogleDriveAdapter googleDriveAdapter = null; ++ ++ public void setGoogleDriveAdapter(GoogleDriveAdapter googleDriveAdapter) { ++ this.googleDriveAdapter = googleDriveAdapter; ++ } + } +diff --git a/src/com/keepassdroid/PasswordActivity.java b/src/com/keepassdroid/PasswordActivity.java +index f589fb6..e8c0943 100644 +--- a/src/com/keepassdroid/PasswordActivity.java ++++ b/src/com/keepassdroid/PasswordActivity.java +@@ -75,6 +75,9 @@ public class PasswordActivity extends LockingActivity { + private boolean mRememberKeyfile; + SharedPreferences prefs; + ++ //Required for Google Drive Integration ++ private GoogleDriveAdapter googleDriveAdapter; ++ + public static void Launch(Activity act, String fileName) throws FileNotFoundException { + Launch(act,fileName,""); + } +@@ -97,6 +100,12 @@ public class PasswordActivity extends LockingActivity { + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + ++ if(googleDriveAdapter != null && ++ googleDriveAdapter.handleActivityResult(requestCode, resultCode, data, this)) { ++ //Handled by google drive adapter ++ return; ++ } ++ + switch (requestCode) { + + case KeePass.EXIT_NORMAL: +@@ -155,7 +164,20 @@ public class PasswordActivity extends LockingActivity { + prefs = PreferenceManager.getDefaultSharedPreferences(this); + mRememberKeyfile = prefs.getBoolean(getString(R.string.keyfile_key), getResources().getBoolean(R.bool.keyfile_default)); + +- if ( action != null && action.equals(VIEW_INTENT) ) { ++ //Required for Google Drive Integration ++ googleDriveAdapter = new GoogleDriveAdapter(); ++ ++ if("com.google.android.apps.drive.DRIVE_OPEN".equals(action)) { //if block added for Google Drive integration ++ //Was action handled successfully by google drive adapter? ++ if (googleDriveAdapter.handleDriveOpenAction(action, i.getStringExtra("resourceId"), this)) { ++ setFileName("drive://" + googleDriveAdapter.getDriveFileId(), false); ++ } else { ++ //There was a problem handling the google drive action ++ finish(); ++ return; ++ } ++ } else if ( action != null && action.equals(VIEW_INTENT) ) { ++ + mFileName = i.getDataString(); + + if ( ! mFileName.substring(0, 7).equals("file://") ) { +@@ -372,6 +394,8 @@ public class PasswordActivity extends LockingActivity { + // Clear before we load + Database db = App.getDB(); + db.clear(); ++ //Load Google Drive info ++ db.setGoogleDriveAdapter(googleDriveAdapter); + + // Clear the shutdown flag + App.clearShutdown(); +@@ -394,7 +418,7 @@ public class PasswordActivity extends LockingActivity { + te.setText(str); + } + } +- ++ + @Override + public boolean onCreateOptionsMenu(Menu menu) { + super.onCreateOptionsMenu(menu); +@@ -437,4 +461,16 @@ public class PasswordActivity extends LockingActivity { + } + } + ++ //Required for Google Drive Integration ++ public void setFileName(String fileName, boolean populateView) { ++ mFileName = fileName; ++ if(populateView) { ++ PasswordActivity.this.runOnUiThread(new Runnable() { ++ public void run() { ++ populateView(); ++ } ++ }); ++ } ++ } ++ + } +diff --git a/tests/.classpath b/tests/.classpath +index 0807a52..d6cf49e 100644 +--- a/tests/.classpath ++++ b/tests/.classpath +@@ -1,11 +1,11 @@ + + +- +- +- + + + + ++ ++ ++ + + diff --git a/libs/google-api-client-1.12.0-beta.jar b/libs/google-api-client-1.12.0-beta.jar new file mode 100644 index 000000000..c85862626 Binary files /dev/null and b/libs/google-api-client-1.12.0-beta.jar differ diff --git a/libs/google-api-client-android-1.12.0-beta.jar b/libs/google-api-client-android-1.12.0-beta.jar new file mode 100644 index 000000000..cb7cfe8bc Binary files /dev/null and b/libs/google-api-client-android-1.12.0-beta.jar differ diff --git a/libs/google-api-services-drive-v2-rev70-1.12.0-beta.jar b/libs/google-api-services-drive-v2-rev70-1.12.0-beta.jar new file mode 100644 index 000000000..3fa8d140e Binary files /dev/null and b/libs/google-api-services-drive-v2-rev70-1.12.0-beta.jar differ diff --git a/libs/google-http-client-1.12.0-beta.jar b/libs/google-http-client-1.12.0-beta.jar new file mode 100644 index 000000000..6ff05049f Binary files /dev/null and b/libs/google-http-client-1.12.0-beta.jar differ diff --git a/libs/google-http-client-android-1.12.0-beta.jar b/libs/google-http-client-android-1.12.0-beta.jar new file mode 100644 index 000000000..1ed253346 Binary files /dev/null and b/libs/google-http-client-android-1.12.0-beta.jar differ diff --git a/libs/google-http-client-gson-1.12.0-beta.jar b/libs/google-http-client-gson-1.12.0-beta.jar new file mode 100644 index 000000000..7a2e064e7 Binary files /dev/null and b/libs/google-http-client-gson-1.12.0-beta.jar differ diff --git a/libs/google-http-client-jackson-1.12.0-beta.jar b/libs/google-http-client-jackson-1.12.0-beta.jar new file mode 100644 index 000000000..52c2209d9 Binary files /dev/null and b/libs/google-http-client-jackson-1.12.0-beta.jar differ diff --git a/libs/google-http-client-jackson2-1.12.0-beta.jar b/libs/google-http-client-jackson2-1.12.0-beta.jar new file mode 100644 index 000000000..9415c7b23 Binary files /dev/null and b/libs/google-http-client-jackson2-1.12.0-beta.jar differ diff --git a/libs/google-oauth-client-1.12.0-beta.jar b/libs/google-oauth-client-1.12.0-beta.jar new file mode 100644 index 000000000..dad2abe4f Binary files /dev/null and b/libs/google-oauth-client-1.12.0-beta.jar differ diff --git a/libs/gson-2.1.jar b/libs/gson-2.1.jar new file mode 100644 index 000000000..83c5c994b Binary files /dev/null and b/libs/gson-2.1.jar differ diff --git a/libs/guava-jdk5-13.0.jar b/libs/guava-jdk5-13.0.jar new file mode 100644 index 000000000..85881e5de Binary files /dev/null and b/libs/guava-jdk5-13.0.jar differ diff --git a/libs/jackson-core-2.0.5.jar b/libs/jackson-core-2.0.5.jar new file mode 100644 index 000000000..51d1fdeb4 Binary files /dev/null and b/libs/jackson-core-2.0.5.jar differ diff --git a/libs/jackson-core-asl-1.9.9.jar b/libs/jackson-core-asl-1.9.9.jar new file mode 100644 index 000000000..d75843d1c Binary files /dev/null and b/libs/jackson-core-asl-1.9.9.jar differ diff --git a/libs/jsr305-1.3.9.jar b/libs/jsr305-1.3.9.jar new file mode 100644 index 000000000..a9afc6619 Binary files /dev/null and b/libs/jsr305-1.3.9.jar differ diff --git a/proguard-google-api-client.txt b/proguard-google-api-client.txt new file mode 100644 index 000000000..ca7616a58 --- /dev/null +++ b/proguard-google-api-client.txt @@ -0,0 +1,25 @@ +# ProGuard Configuration file +# +# See http://proguard.sourceforge.net/index.html#manual/usage.html + +# Needed to keep generic types and @Key annotations accessed via reflection + +-keepattributes Signature,RuntimeVisibleAnnotations,AnnotationDefault + +-keepclassmembers class * { + @com.google.api.client.util.Key ; +} + +# Needed by Guava +# See https://groups.google.com/forum/#!topic/guava-discuss/YCZzeCiIVoI + +-dontwarn sun.misc.Unsafe +-dontwarn com.google.common.collect.MinMaxPriorityQueue + +# Needed by google-http-client-android when linking against an older platform version + +-dontwarn com.google.api.client.extensions.android.** + +# Needed by google-api-client-android when linking against an older platform version + +-dontwarn com.google.api.client.googleapis.extensions.android.** diff --git a/project.properties b/project.properties index adea83f0a..b1c311347 100644 --- a/project.properties +++ b/project.properties @@ -10,5 +10,6 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=android-11 +target=android-17 apk-configurations= +android.library.reference.1=../../../keepassdroid/google-play-services_lib diff --git a/src/com/keepassdroid/Database.java b/src/com/keepassdroid/Database.java index fce874b6c..bdaf07c48 100644 --- a/src/com/keepassdroid/Database.java +++ b/src/com/keepassdroid/Database.java @@ -156,6 +156,11 @@ public void SaveData(String filename) throws IOException, PwDbOutputException { mFilename = filename; + //Required for Google Drive Integration + if(googleDriveAdapter != null) { + googleDriveAdapter.update(orig); + } + } public void clear() { @@ -180,4 +185,10 @@ public void markAllGroupsAsDirty() { } + //Required for Google Drive Integration + private GoogleDriveAdapter googleDriveAdapter = null; + + public void setGoogleDriveAdapter(GoogleDriveAdapter googleDriveAdapter) { + this.googleDriveAdapter = googleDriveAdapter; + } } diff --git a/src/com/keepassdroid/GoogleDriveAdapter.java b/src/com/keepassdroid/GoogleDriveAdapter.java new file mode 100644 index 000000000..8e8d8b4ea --- /dev/null +++ b/src/com/keepassdroid/GoogleDriveAdapter.java @@ -0,0 +1,233 @@ +package com.keepassdroid; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import android.accounts.AccountManager; +import android.app.Activity; +import android.content.Intent; +import android.os.Environment; +import android.util.Log; + +import com.google.android.gms.auth.GoogleAuthUtil; +import com.google.android.gms.auth.UserRecoverableAuthException; +import com.google.android.gms.common.AccountPicker; +import com.google.api.client.extensions.android.http.AndroidHttp; +import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential; +import com.google.api.client.http.FileContent; +import com.google.api.client.http.GenericUrl; +import com.google.api.client.http.HttpResponse; +import com.google.api.client.json.gson.GsonFactory; +import com.google.api.services.drive.Drive; +import com.google.api.services.drive.DriveScopes; + + +public class GoogleDriveAdapter { + private static final String TAG = "PasswordActivity"; + private static final int REQUEST_AUTHORIZATION = 2; + private static final int REQUEST_ACCOUNT_PICKER = 3; + private static final int CHOOSE_ACCOUNT_AND_LOAD_FILE = 4; + private static final String[] ACCOUNT_TYPE = new String[] {GoogleAuthUtil.GOOGLE_ACCOUNT_TYPE}; + private String driveFileId; + private com.google.api.services.drive.model.File driveFile; + private Drive driveService; + private String localDriveFileName; + private GoogleAccountCredential credential; + + + public String getDriveFileId() { + return driveFileId; + } + + public void setDriveFileId(String driveFileId) { + this.driveFileId = driveFileId; + } + + public void clearDriveFileInfo() { + driveFileId = null; + driveFile = null; + localDriveFileName = null; + } + + public boolean handleDriveOpenAction(String action, String driveFileId, Activity activity) { + boolean result = false; + if (driveFileId == null || driveFileId.length() == 0) { + Log.e(TAG, "Failed to retrieve the Drive file ID."); + result = false; + } else { + this.setDriveFileId(driveFileId); + Intent accountPickerIntent = AccountPicker.newChooseAccountIntent(null, null, ACCOUNT_TYPE, false, null, null, null, null); + activity.startActivityForResult(accountPickerIntent, CHOOSE_ACCOUNT_AND_LOAD_FILE); + Log.i(TAG, "GoogleDriveAdapter handling open drive file after starting choose account activity"); + result = true; + } + return result; + } + + public boolean handleActivityResult(int requestCode, int resultCode, + Intent data, Activity activity) { + boolean result = false; + switch (requestCode) { + case REQUEST_AUTHORIZATION: + if (resultCode == Activity.RESULT_OK) { + loadDriveFile(activity); + } else { + activity.startActivityForResult( + credential.newChooseAccountIntent(), + REQUEST_ACCOUNT_PICKER); + } + result = true; + break; + case REQUEST_ACCOUNT_PICKER: + if (resultCode == Activity.RESULT_OK && data != null + && data.getExtras() != null) { + String accountName = data.getStringExtra(AccountManager.KEY_ACCOUNT_NAME); + if (accountName != null) { + credential.setSelectedAccountName(accountName); + driveService = buildDriveService(credential); + loadDriveFile(activity); + } + } + result = true; + break; + case CHOOSE_ACCOUNT_AND_LOAD_FILE: // Needed for Google Drive + String accountName = null; + if (resultCode == Activity.RESULT_OK) { + accountName = data.getStringExtra(AccountManager.KEY_ACCOUNT_NAME); + } + if(accountName == null || accountName.length() <= 0) { + activity.setResult(Activity.RESULT_CANCELED); + activity.finish(); + } + if (driveService == null) { + try { + + credential = GoogleAccountCredential.usingOAuth2(activity, DriveScopes.DRIVE_FILE); + credential.setSelectedAccountName(accountName); + driveService = buildDriveService(credential); + } catch (Exception e) { + Log.e(TAG, "Error getting access to the user's drive service", e); + if (e instanceof UserRecoverableAuthException) { + //Try to recover by requesting authorization and then loading the file + activity.startActivityForResult( + ((UserRecoverableAuthException) e).getIntent(), + REQUEST_AUTHORIZATION); + } + } + } + //Load the file from Google Drive + loadDriveFile(activity); + result = true; + break; + } + return result; + } + + + private Drive buildDriveService(GoogleAccountCredential credential) { + return new Drive.Builder(AndroidHttp.newCompatibleTransport(), new GsonFactory(), credential).build(); + } + + + private static InputStream downloadFile(Drive service, + com.google.api.services.drive.model.File file) { + if (file.getDownloadUrl() != null && file.getDownloadUrl().length() > 0) { + try { + HttpResponse resp = service.getRequestFactory() + .buildGetRequest(new GenericUrl(file.getDownloadUrl())) + .execute(); + return resp.getContent(); + } catch (IOException e) { + Log.e(TAG, "Error occurred downloading file", e); + return null; + } + } else { + // The file doesn't have any content stored on Drive. + return null; + } + } + + + private void loadDriveFile(final Activity activity) { + Thread t = new Thread(new Runnable() { + @Override + public void run() { + try { + + credential.getToken(); + + // First retrieve the file from the API. + driveFile = driveService.files().get(driveFileId).execute(); + + //Then download the file + InputStream inputStream = downloadFile(driveService, driveFile); + + //Store the downloaded file to the external storage directory + String mediaStorageDir = Environment.getExternalStorageDirectory().getPath(); + localDriveFileName = mediaStorageDir + + java.io.File.separator + + driveFile.getOriginalFilename(); + + OutputStream outputStream = null; + + try { + + //Write the inputStream to a FileOutputStream + outputStream = new FileOutputStream(new java.io.File(localDriveFileName)); + + int read = 0; + byte[] bytes = new byte[1024]; + + while ((read = inputStream.read(bytes)) != -1) { + outputStream.write(bytes, 0, read); + } + + } catch (IOException e) { + Log.e(TAG, "Error occurred writing downloaded file to disk", e); + } finally { + if (inputStream != null) { + try { + inputStream.close(); + } catch (IOException e) { + } + } + if (outputStream != null) { + try { + // outputStream.flush(); + outputStream.close(); + } catch (IOException e) { + } + + } + } + + //Update the GUI in the activity with the path to the downloaded file + ((PasswordActivity)activity).setFileName(localDriveFileName, true); + + } catch (Exception e) { + Log.e(TAG, "Error occurred trying to load file from google drive", e); + if (e instanceof UserRecoverableAuthException) { + + activity.startActivityForResult( + ((UserRecoverableAuthException) e).getIntent(), + REQUEST_AUTHORIZATION); + } + } + } + }); + t.start(); + + } + + public void update(File updatedFile) throws IOException { + if(driveFile != null && driveFileId != null) { + FileContent mediaContent = new FileContent(driveFile.getMimeType(), updatedFile); + //Update the file in google drive + @SuppressWarnings("unused") + com.google.api.services.drive.model.File updatedDriveFile = driveService.files().update(driveFileId, driveFile, mediaContent).execute(); + } + } +} diff --git a/src/com/keepassdroid/PasswordActivity.java b/src/com/keepassdroid/PasswordActivity.java index f589fb63d..e8c09430b 100644 --- a/src/com/keepassdroid/PasswordActivity.java +++ b/src/com/keepassdroid/PasswordActivity.java @@ -75,6 +75,9 @@ public class PasswordActivity extends LockingActivity { private boolean mRememberKeyfile; SharedPreferences prefs; + //Required for Google Drive Integration + private GoogleDriveAdapter googleDriveAdapter; + public static void Launch(Activity act, String fileName) throws FileNotFoundException { Launch(act,fileName,""); } @@ -97,6 +100,12 @@ public static void Launch(Activity act, String fileName, String keyFile) throws protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); + if(googleDriveAdapter != null && + googleDriveAdapter.handleActivityResult(requestCode, resultCode, data, this)) { + //Handled by google drive adapter + return; + } + switch (requestCode) { case KeePass.EXIT_NORMAL: @@ -155,7 +164,20 @@ protected void onCreate(Bundle savedInstanceState) { prefs = PreferenceManager.getDefaultSharedPreferences(this); mRememberKeyfile = prefs.getBoolean(getString(R.string.keyfile_key), getResources().getBoolean(R.bool.keyfile_default)); - if ( action != null && action.equals(VIEW_INTENT) ) { + //Required for Google Drive Integration + googleDriveAdapter = new GoogleDriveAdapter(); + + if("com.google.android.apps.drive.DRIVE_OPEN".equals(action)) { //if block added for Google Drive integration + //Was action handled successfully by google drive adapter? + if (googleDriveAdapter.handleDriveOpenAction(action, i.getStringExtra("resourceId"), this)) { + setFileName("drive://" + googleDriveAdapter.getDriveFileId(), false); + } else { + //There was a problem handling the google drive action + finish(); + return; + } + } else if ( action != null && action.equals(VIEW_INTENT) ) { + mFileName = i.getDataString(); if ( ! mFileName.substring(0, 7).equals("file://") ) { @@ -372,6 +394,8 @@ private void loadDatabase(String pass, String keyfile) // Clear before we load Database db = App.getDB(); db.clear(); + //Load Google Drive info + db.setGoogleDriveAdapter(googleDriveAdapter); // Clear the shutdown flag App.clearShutdown(); @@ -394,7 +418,7 @@ private void setEditText(int resId, String str) { te.setText(str); } } - + @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); @@ -437,4 +461,16 @@ public void run() { } } + //Required for Google Drive Integration + public void setFileName(String fileName, boolean populateView) { + mFileName = fileName; + if(populateView) { + PasswordActivity.this.runOnUiThread(new Runnable() { + public void run() { + populateView(); + } + }); + } + } + }