Merge "Java: remove a 1-day caveat from Android blessings"
diff --git a/projects/account_manager/src/main/java/io/v/android/apps/account_manager/AccountActivity.java b/projects/account_manager/src/main/java/io/v/android/apps/account_manager/AccountActivity.java
index 0e540b2..ae28afa 100644
--- a/projects/account_manager/src/main/java/io/v/android/apps/account_manager/AccountActivity.java
+++ b/projects/account_manager/src/main/java/io/v/android/apps/account_manager/AccountActivity.java
@@ -21,6 +21,7 @@
import android.widget.Toast;
import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableList;
import com.google.common.io.CharStreams;
import org.joda.time.DateTime;
@@ -197,10 +198,9 @@
OAuthBlesserClient blesser =
OAuthBlesserClientFactory.getOAuthBlesserClient("identity/dev.v.io/u/google");
VContext ctx = mBaseContext.withTimeout(new Duration(20000)); // 20s
- List<Caveat> caveats = new ArrayList<>();
- caveats.add(VSecurity.newExpiryCaveat(DateTime.now().plusDays(1)));
OAuthBlesserClient.BlessUsingAccessTokenWithCaveatsOut reply =
- blesser.blessUsingAccessTokenWithCaveats(ctx, tokens[0], caveats);
+ blesser.blessUsingAccessTokenWithCaveats(ctx, tokens[0],
+ ImmutableList.<Caveat>of(VSecurity.newUnconstrainedUseCaveat()));
Blessings blessing = reply.blessing;
if (blessing == null || blessing.getCertificateChains() == null ||
blessing.getCertificateChains().size() <= 0) {
diff --git a/projects/account_manager/src/main/java/io/v/android/apps/account_manager/BlessingChooserActivity.java b/projects/account_manager/src/main/java/io/v/android/apps/account_manager/BlessingChooserActivity.java
index 52a24c9..403359f 100644
--- a/projects/account_manager/src/main/java/io/v/android/apps/account_manager/BlessingChooserActivity.java
+++ b/projects/account_manager/src/main/java/io/v/android/apps/account_manager/BlessingChooserActivity.java
@@ -14,6 +14,8 @@
import android.widget.ScrollView;
import android.widget.Toast;
+import com.google.common.collect.ImmutableList;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -27,6 +29,7 @@
import io.v.v23.security.VCertificate;
import io.v.v23.security.VPrincipal;
import io.v.v23.security.VSecurity;
+import io.v.v23.security.WireBlessings;
import io.v.v23.vom.VomUtil;
/**
@@ -127,9 +130,7 @@
}
for (List<VCertificate> certChain: chains) {
- List<List<VCertificate>> certChains = new ArrayList<List<VCertificate>>();
- certChains.add(certChain);
- Blessings blessing = Blessings.create(certChains);
+ Blessings blessing = Blessings.create(new WireBlessings(ImmutableList.of(certChain)));
mBlessings.put(blessingsView.getChildCount(), blessing);
LinearLayout blessingView =
diff --git a/projects/account_manager/src/main/java/io/v/android/apps/account_manager/BlessingStoreDisplayActivity.java b/projects/account_manager/src/main/java/io/v/android/apps/account_manager/BlessingStoreDisplayActivity.java
index 0a0499c..10f7406 100644
--- a/projects/account_manager/src/main/java/io/v/android/apps/account_manager/BlessingStoreDisplayActivity.java
+++ b/projects/account_manager/src/main/java/io/v/android/apps/account_manager/BlessingStoreDisplayActivity.java
@@ -13,6 +13,7 @@
import android.widget.ListView;
import android.widget.Toast;
+import com.google.common.collect.ImmutableList;
import com.google.common.reflect.TypeToken;
import java.util.ArrayList;
@@ -26,6 +27,7 @@
import io.v.v23.security.Blessings;
import io.v.v23.security.VCertificate;
import io.v.v23.security.VPrincipal;
+import io.v.v23.security.WireBlessings;
import io.v.v23.vom.VomUtil;
/**
@@ -92,14 +94,12 @@
entry.getKey().getValue());
currentPreference.setIntent(intent);
- List<List<VCertificate>> b = new ArrayList<List<VCertificate>>();
- b.add(certChain);
- if (Blessings.create(b).signingBlessings().isEmpty()) {
+ Blessings b = Blessings.create(new WireBlessings(ImmutableList.of(certChain)));
+ if (b.signingBlessings().isEmpty()) {
nonSigningCat.addPreference(currentPreference);
} else {
signingCat.addPreference(currentPreference);
}
-
}
}
if (signingCat.getPreferenceCount() <= 0) {
