Skip to content
This repository was archived by the owner on Feb 18, 2024. It is now read-only.

Commit e80ab49

Browse files
author
Yaniv Inbar
committed
1 parent bd30519 commit e80ab49

File tree

6 files changed

+117
-42
lines changed

6 files changed

+117
-42
lines changed

picasa-android-sample/.classpath

+22-9
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,37 @@
55
<classpathentry kind="con"
66
path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK" />
77
<classpathentry kind="var"
8-
path="M2_REPO/com/google/http-client/google-http-client/1.5.0-beta/google-http-client-1.5.0-beta.jar"
9-
sourcepath="M2_REPO/com/google/http-client/google-http-client/1.5.0-beta/google-http-client-1.5.0-beta-sources.jar" />
8+
path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar" />
109
<classpathentry kind="var"
11-
path="M2_REPO/com/google/http-client/google-http-client-extensions-android2/1.5.0-beta/google-http-client-extensions-android2-1.5.0-beta.jar"
12-
sourcepath="M2_REPO/com/google/http-client/google-http-client-extensions-android2/1.5.0-beta/google-http-client-extensions-android2-1.5.0-beta-sources.jar" />
10+
path="M2_REPO/com/google/http-client/google-http-client/1.6.0-beta-SNAPSHOT/google-http-client-1.6.0-beta-SNAPSHOT.jar"
11+
sourcepath="M2_REPO/com/google/http-client/google-http-client/1.6.0-beta-SNAPSHOT/google-http-client-1.6.0-beta-SNAPSHOT-sources.jar" />
1312
<classpathentry kind="var"
14-
path="M2_REPO/com/google/api-client/google-api-client/1.5.0-beta/google-api-client-1.5.0-beta.jar"
15-
sourcepath="M2_REPO/com/google/api-client/google-api-client/1.5.0-beta/google-api-client-1.5.0-beta-sources.jar" />
13+
path="M2_REPO/com/google/http-client/google-http-client-extensions-android2/1.6.0-beta-SNAPSHOT/google-http-client-extensions-android2-1.6.0-beta-SNAPSHOT.jar"
14+
sourcepath="M2_REPO/com/google/http-client/google-http-client-extensions-android2/1.6.0-beta-SNAPSHOT/google-http-client-extensions-android2-1.6.0-beta-SNAPSHOT-sources.jar" />
1615
<classpathentry kind="var"
17-
path="M2_REPO/com/google/api-client/google-api-client-extensions-android2/1.5.0-beta/google-api-client-extensions-android2-1.5.0-beta.jar"
18-
sourcepath="M2_REPO/com/google/api-client/google-api-client-extensions-android2/1.5.0-beta/google-api-client-extensions-android2-1.5.0-beta-sources.jar" />
16+
path="M2_REPO/com/google/code/gson/gson/1.7.1/gson-1.7.1.jar" sourcepath="M2_REPO/com/google/code/gson/gson/1.7.1/gson-1.7.1-sources.jar" />
17+
<classpathentry kind="var"
18+
path="M2_REPO/com/google/oauth-client/google-oauth-client/1.6.0-beta-SNAPSHOT/google-oauth-client-1.6.0-beta-SNAPSHOT.jar"
19+
sourcepath="M2_REPO/com/google/oauth-client/google-oauth-client/1.6.0-beta-SNAPSHOT/google-oauth-client-1.6.0-beta-SNAPSHOT-sources.jar" />
20+
<classpathentry kind="var"
21+
path="M2_REPO/com/google/api-client/google-api-client/1.6.0-beta-SNAPSHOT/google-api-client-1.6.0-beta-SNAPSHOT.jar"
22+
sourcepath="M2_REPO/com/google/api-client/google-api-client/1.6.0-beta-SNAPSHOT/google-api-client-1.6.0-beta-SNAPSHOT-sources.jar" />
23+
<classpathentry kind="var"
24+
path="M2_REPO/com/google/api-client/google-api-client-extensions-android2/1.6.0-beta-SNAPSHOT/google-api-client-extensions-android2-1.6.0-beta-SNAPSHOT.jar"
25+
sourcepath="M2_REPO/com/google/api-client/google-api-client-extensions-android2/1.6.0-beta-SNAPSHOT/google-api-client-extensions-android2-1.6.0-beta-SNAPSHOT-sources.jar" />
1926
<classpathentry kind="var"
2027
path="M2_REPO/com/google/apis-samples/shared-sample-picasa/v2-1.0.0/shared-sample-picasa-v2-1.0.0.jar"
2128
sourcepath="/M2_REPO/com/google/apis-samples/shared-sample-picasa/v2-1.0.0/shared-sample-picasa-v2-1.0.0-sources.jar" />
2229
<classpathentry kind="var"
2330
path="M2_REPO/com/google/apis-samples/shared-sample-gdata/1.0.0/shared-sample-gdata-1.0.0.jar"
2431
sourcepath="M2_REPO/com/google/apis-samples/shared-sample-gdata/1.0.0/shared-sample-gdata-1.0.0-sources.jar" />
2532
<classpathentry kind="var"
26-
path="M2_REPO/com/google/guava/guava/r09/guava-r09.jar" />
33+
path="M2_REPO/com/google/protobuf/protobuf-java/2.2.0/protobuf-java-2.2.0.jar"
34+
sourcepath="M2_REPO/com/google/protobuf/protobuf-java/2.2.0/protobuf-java-2.2.0-sources.jar" />
35+
<classpathentry kind="var"
36+
path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.9.1/jackson-core-asl-1.9.1.jar"
37+
sourcepath="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.9.1/jackson-core-asl-1.9.1-sources.jar" />
38+
<classpathentry kind="var"
39+
path="M2_REPO/com/google/guava/guava/r09/guava-r09.jar" sourcepath="M2_REPO/com/google/guava/guava/r09/guava-r09-sources.jar" />
2740
<classpathentry kind="output" path="bin/classes" />
2841
</classpath>

picasa-android-sample/proguard.cfg

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# These configurations are what the Android Eclipse plugin generates by default
2+
3+
-optimizationpasses 5
4+
-dontusemixedcaseclassnames
5+
-dontskipnonpubliclibraryclasses
6+
-dontpreverify
7+
-verbose
8+
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
9+
10+
-keep public class * extends android.app.Activity
11+
-keep public class * extends android.app.Application
12+
-keep public class * extends android.app.Service
13+
-keep public class * extends android.content.BroadcastReceiver
14+
-keep public class * extends android.content.ContentProvider
15+
-keep public class com.android.vending.licensing.ILicensingService
16+
17+
-keepclasseswithmembernames class * {
18+
native <methods>;
19+
}
20+
21+
-keepclasseswithmembernames class * {
22+
public <init>(android.content.Context, android.util.AttributeSet);
23+
}
24+
25+
-keepclasseswithmembernames class * {
26+
public <init>(android.content.Context, android.util.AttributeSet, int);
27+
}
28+
29+
-keepclassmembers enum * {
30+
public static **[] values();
31+
public static ** valueOf(java.lang.String);
32+
}
33+
34+
-keep class * implements android.os.Parcelable {
35+
public static final android.os.Parcelable$Creator *;
36+
}
37+
38+
# Needed by google-api-client to keep generic types and @Key annotations accessed via reflection
39+
40+
-keepclassmembers class * {
41+
@com.google.api.client.util.Key <fields>;
42+
}
43+
44+
-keepattributes Signature,RuntimeVisibleAnnotations,AnnotationDefault
45+
46+
# Needed by Guava
47+
48+
-dontwarn sun.misc.Unsafe

picasa-android-sample/project.properties

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
split.density=false
1212
# Project target.
1313
target=Google Inc.:Google APIs:7
14+
proguard.config=proguard.cfg

tasks-android-sample/.classpath

+22-19
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,37 @@
55
<classpathentry kind="con"
66
path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK" />
77
<classpathentry kind="var"
8-
path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.6.7/jackson-core-asl-1.6.7.jar"
9-
sourcepath="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.6.7/jackson-core-asl-1.6.7-sources.jar" />
8+
path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar" />
109
<classpathentry kind="var"
11-
path="M2_REPO/com/google/apis-samples/shared-sample-android/1.0.0/shared-sample-android-1.0.0.jar"
12-
sourcepath="M2_REPO/com/google/api-client/shared-sample-android/1.0.0/shared-sample-android-1.0.0-sources.jar" />
10+
path="M2_REPO/com/google/http-client/google-http-client/1.6.0-beta-SNAPSHOT/google-http-client-1.6.0-beta-SNAPSHOT.jar"
11+
sourcepath="M2_REPO/com/google/http-client/google-http-client/1.6.0-beta-SNAPSHOT/google-http-client-1.6.0-beta-SNAPSHOT-sources.jar" />
1312
<classpathentry kind="var"
14-
path="M2_REPO/com/google/api-client/google-api-client/1.5.0-beta/google-api-client-1.5.0-beta.jar"
15-
sourcepath="M2_REPO/com/google/api-client/google-api-client/1.5.0-beta/google-api-client-1.5.0-beta-sources.jar" />
13+
path="M2_REPO/com/google/http-client/google-http-client-extensions-android2/1.6.0-beta-SNAPSHOT/google-http-client-extensions-android2-1.6.0-beta-SNAPSHOT.jar"
14+
sourcepath="M2_REPO/com/google/http-client/google-http-client-extensions-android2/1.6.0-beta-SNAPSHOT/google-http-client-extensions-android2-1.6.0-beta-SNAPSHOT-sources.jar" />
1615
<classpathentry kind="var"
17-
path="M2_REPO/com/google/api-client/google-api-client-extensions-android2/1.5.0-beta/google-api-client-extensions-android2-1.5.0-beta.jar"
18-
sourcepath="M2_REPO/com/google/api-client/google-api-client-extensions-android2/1.5.0-beta/google-api-client-extensions-android2-1.5.0-beta-sources.jar" />
16+
path="M2_REPO/com/google/code/gson/gson/1.7.1/gson-1.7.1.jar" sourcepath="M2_REPO/com/google/code/gson/gson/1.7.1/gson-1.7.1-sources.jar" />
1917
<classpathentry kind="var"
20-
path="M2_REPO/com/google/http-client/google-http-client/1.5.0-beta/google-http-client-1.5.0-beta.jar"
21-
sourcepath="M2_REPO/com/google/http-client/google-http-client/1.5.0-beta/google-http-client-1.5.0-beta-sources.jar" />
18+
path="M2_REPO/com/google/oauth-client/google-oauth-client/1.6.0-beta-SNAPSHOT/google-oauth-client-1.6.0-beta-SNAPSHOT.jar"
19+
sourcepath="M2_REPO/com/google/oauth-client/google-oauth-client/1.6.0-beta-SNAPSHOT/google-oauth-client-1.6.0-beta-SNAPSHOT-sources.jar" />
2220
<classpathentry kind="var"
23-
path="M2_REPO/com/google/http-client/google-http-client-extensions-android2/1.5.0-beta/google-http-client-extensions-android2-1.5.0-beta.jar"
24-
sourcepath="M2_REPO/com/google/http-client/google-http-client-extensions-android2/1.5.0-beta/google-http-client-extensions-android2-1.5.0-beta-sources.jar" />
21+
path="M2_REPO/com/google/api-client/google-api-client/1.6.0-beta-SNAPSHOT/google-api-client-1.6.0-beta-SNAPSHOT.jar"
22+
sourcepath="M2_REPO/com/google/api-client/google-api-client/1.6.0-beta-SNAPSHOT/google-api-client-1.6.0-beta-SNAPSHOT-sources.jar" />
2523
<classpathentry kind="var"
26-
path="M2_REPO/com/google/oauth-client/google-oauth-client/1.5.0-beta/google-oauth-client-1.5.0-beta.jar"
27-
sourcepath="M2_REPO/com/google/oauth-client/google-oauth-client/1.5.0-beta/google-oauth-client-1.5.0-beta-sources.jar" />
24+
path="M2_REPO/com/google/api-client/google-api-client-extensions-android2/1.6.0-beta-SNAPSHOT/google-api-client-extensions-android2-1.6.0-beta-SNAPSHOT.jar"
25+
sourcepath="M2_REPO/com/google/api-client/google-api-client-extensions-android2/1.6.0-beta-SNAPSHOT/google-api-client-extensions-android2-1.6.0-beta-SNAPSHOT-sources.jar" />
2826
<classpathentry kind="var"
29-
path="M2_REPO/com/google/apis/google-api-services-tasks/v1-1.2.0-beta/google-api-services-tasks-v1-1.2.0-beta.jar"
30-
sourcepath="M2_REPO/com/google/apis/google-api-services-tasks/v1-1.2.0-beta/google-api-services-tasks-v1-1.2.0-beta-sources.jar" />
27+
path="M2_REPO/com/google/apis/google-api-services-tasks/v1-1.3.0-beta-SNAPSHOT/google-api-services-tasks-v1-1.3.0-beta-SNAPSHOT.jar"
28+
sourcepath="M2_REPO/com/google/apis/google-api-services-tasks/v1-1.3.0-beta-SNAPSHOT/google-api-services-tasks-v1-1.3.0-beta-SNAPSHOT-sources.jar" />
3129
<classpathentry kind="var"
32-
path="M2_REPO/com/google/code/gson/gson/1.6/gson-1.6.jar" sourcepath="M2_REPO/com/google/code/gson/gson/1.6/gson-1.6-sources.jar" />
30+
path="M2_REPO/com/google/apis-samples/shared-sample-android/1.0.0/shared-sample-android-1.0.0.jar"
31+
sourcepath="M2_REPO/com/google/api-client/shared-sample-android/1.0.0/shared-sample-android-1.0.0-sources.jar" />
3332
<classpathentry kind="var"
34-
path="M2_REPO/com/google/guava/guava/r09/guava-r09.jar" sourcepath="M2_REPO/com/google/guava/guava/r09/guava-r09-sources.jar" />
33+
path="M2_REPO/com/google/protobuf/protobuf-java/2.2.0/protobuf-java-2.2.0.jar"
34+
sourcepath="M2_REPO/com/google/protobuf/protobuf-java/2.2.0/protobuf-java-2.2.0-sources.jar" />
3535
<classpathentry kind="var"
36-
path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar" />
36+
path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.9.1/jackson-core-asl-1.9.1.jar"
37+
sourcepath="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.9.1/jackson-core-asl-1.9.1-sources.jar" />
38+
<classpathentry kind="var"
39+
path="M2_REPO/com/google/guava/guava/r09/guava-r09.jar" sourcepath="M2_REPO/com/google/guava/guava/r09/guava-r09-sources.jar" />
3740
<classpathentry kind="output" path="bin/classes" />
3841
</classpath>

tasks-android-sample/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<dependency>
133133
<groupId>com.google.apis</groupId>
134134
<artifactId>google-api-services-tasks</artifactId>
135-
<version>v1-1.2.0-beta</version>
135+
<version>v1-1.3.0-beta-SNAPSHOT</version>
136136
</dependency>
137137
<dependency>
138138
<groupId>com.google.apis-samples</groupId>

tasks-android-sample/src/main/java/com/google/api/services/samples/tasks/android/TasksSample.java

+23-13
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
22
* Copyright (c) 2011 Google Inc.
3-
*
3+
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
55
* in compliance with the License. You may obtain a copy of the License at
6-
*
6+
*
77
* http://www.apache.org/licenses/LICENSE-2.0
8-
*
8+
*
99
* Unless required by applicable law or agreed to in writing, software distributed under the License
1010
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
1111
* or implied. See the License for the specific language governing permissions and limitations under
@@ -20,9 +20,12 @@
2020
import com.google.api.client.http.HttpResponse;
2121
import com.google.api.client.http.HttpResponseException;
2222
import com.google.api.client.http.HttpTransport;
23+
import com.google.api.client.http.json.JsonHttpRequest;
24+
import com.google.api.client.http.json.JsonHttpRequestInitializer;
2325
import com.google.api.client.json.jackson.JacksonFactory;
2426
import com.google.api.services.samples.shared.android.ClientCredentials;
2527
import com.google.api.services.tasks.Tasks;
28+
import com.google.api.services.tasks.TasksRequest;
2629
import com.google.api.services.tasks.model.Task;
2730

2831
import android.accounts.Account;
@@ -54,9 +57,9 @@
5457
* To enable logging of HTTP requests/responses, change {@link #LOGGING_LEVEL} to
5558
* {@link Level#CONFIG} or {@link Level#ALL} and run this command:
5659
* </p>
57-
*
60+
*
5861
* <pre>adb shell setprop log.tag.HttpTransport DEBUG * </pre>
59-
*
62+
*
6063
* @author Johan Euphrosine (based on Yaniv Inbar Buzz sample)
6164
*/
6265
public class TasksSample extends ListActivity {
@@ -86,9 +89,16 @@ public class TasksSample extends ListActivity {
8689
@Override
8790
public void onCreate(Bundle savedInstanceState) {
8891
super.onCreate(savedInstanceState);
89-
service = new Tasks(transport, accessProtectedResource, new JacksonFactory());
90-
service.setKey(ClientCredentials.KEY);
91-
service.setApplicationName("Google-TasksSample/1.0");
92+
service =
93+
Tasks.builder(transport, new JacksonFactory()).setApplicationName("Google-TasksSample/1.0")
94+
.setHttpRequestInitializer(accessProtectedResource)
95+
.setJsonHttpRequestInitializer(new JsonHttpRequestInitializer() {
96+
97+
public void initialize(JsonHttpRequest request) throws IOException {
98+
TasksRequest tasksRequest = (TasksRequest) request;
99+
tasksRequest.setKey(ClientCredentials.KEY);
100+
}
101+
}).build();
92102
accountManager = new GoogleAccountManager(this);
93103
Logger.getLogger("com.google.api.client").setLevel(LOGGING_LEVEL);
94104
gotAccount(false);
@@ -136,8 +146,8 @@ void gotAccount(final Account account) {
136146
SharedPreferences.Editor editor = settings.edit();
137147
editor.putString("accountName", account.name);
138148
editor.commit();
139-
accountManager.manager.getAuthToken(
140-
account, AUTH_TOKEN_TYPE, true, new AccountManagerCallback<Bundle>() {
149+
accountManager.manager.getAuthToken(account, AUTH_TOKEN_TYPE, true,
150+
new AccountManagerCallback<Bundle>() {
141151

142152
public void run(AccountManagerFuture<Bundle> future) {
143153
try {
@@ -147,8 +157,8 @@ public void run(AccountManagerFuture<Bundle> future) {
147157
intent.setFlags(intent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_TASK);
148158
startActivityForResult(intent, REQUEST_AUTHENTICATE);
149159
} else if (bundle.containsKey(AccountManager.KEY_AUTHTOKEN)) {
150-
accessProtectedResource.setAccessToken(
151-
bundle.getString(AccountManager.KEY_AUTHTOKEN));
160+
accessProtectedResource.setAccessToken(bundle
161+
.getString(AccountManager.KEY_AUTHTOKEN));
152162
onAuthToken();
153163
}
154164
} catch (Exception e) {
@@ -210,7 +220,7 @@ void handleException(Exception e) {
210220
void onAuthToken() {
211221
try {
212222
List<String> taskTitles = new ArrayList<String>();
213-
List<Task> tasks = service.tasks.list("@default").execute().getItems();
223+
List<Task> tasks = service.tasks().list("@default").execute().getItems();
214224
if (tasks != null) {
215225
for (Task task : tasks) {
216226
taskTitles.add(task.getTitle());

0 commit comments

Comments
 (0)