Merge "Display avatar and a link to change the avatar in the profile screen"

This commit is contained in:
Shawn Pearce
2013-04-25 15:20:08 +00:00
committed by Gerrit Code Review
9 changed files with 122 additions and 3 deletions

View File

@@ -0,0 +1,47 @@
// Copyright (C) 2013 The Android Open Source Project
//
// 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.
package com.google.gerrit.server.account;
import com.google.common.base.Strings;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.server.avatar.AvatarProvider;
import com.google.inject.Inject;
public class GetAvatarChangeUrl implements RestReadView<AccountResource> {
private final DynamicItem<AvatarProvider> avatarProvider;
@Inject
GetAvatarChangeUrl(DynamicItem<AvatarProvider> avatarProvider) {
this.avatarProvider = avatarProvider;
}
@Override
public String apply(AccountResource rsrc)
throws ResourceNotFoundException {
AvatarProvider impl = avatarProvider.get();
if (impl == null) {
throw new ResourceNotFoundException();
}
String url = impl.getChangeAvatarUrl(rsrc.getUser());
if (Strings.isNullOrEmpty(url)) {
throw new ResourceNotFoundException();
} else {
return url;
}
}
}

View File

@@ -31,6 +31,7 @@ public class Module extends RestApiModule {
get(ACCOUNT_KIND).to(GetAccount.class);
get(ACCOUNT_KIND, "avatar").to(GetAvatar.class);
get(ACCOUNT_KIND, "avatar.change.url").to(GetAvatarChangeUrl.class);
child(ACCOUNT_KIND, "capabilities").to(Capabilities.class);
get(ACCOUNT_KIND, "groups").to(GetGroups.class);
get(ACCOUNT_KIND, "preferences.diff").to(GetDiffPreferences.class);