Merge "reader/android: lock screen orientation to portrait mode"
diff --git a/android/app/src/main/java/io/v/android/apps/reader/db/SyncbaseDB.java b/android/app/src/main/java/io/v/android/apps/reader/db/SyncbaseDB.java
index 38628a6..4ae25c3 100644
--- a/android/app/src/main/java/io/v/android/apps/reader/db/SyncbaseDB.java
+++ b/android/app/src/main/java/io/v/android/apps/reader/db/SyncbaseDB.java
@@ -414,7 +414,7 @@
for (List<VCertificate> chain : blessings.getCertificateChains()) {
for (VCertificate certificate : Lists.reverse(chain)) {
if (certificate.getExtension().contains("@")) {
- return certificate.getExtension();
+ return certificate.getExtension().replace(':', '/');
}
}
}
diff --git a/web/Makefile b/web/Makefile
index 74ab93e..3adc980 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -105,7 +105,7 @@
.PHONY:
syncbase: bin/syncbased credentials tmp
$(eval blessing := $(shell bin/principal dump --v23.credentials=./credentials -s=true))
- $(eval email := $(subst dev.v.io/u/,,$(blessing)))
+ $(eval email := $(subst dev.v.io:u:,,$(blessing)))
./bin/syncbased \
--v=5 \
--alsologtostderr=false \
@@ -120,7 +120,7 @@
.PHONY:
cloudsync: bin/syncbased credentials tmp
$(eval blessing := $(shell bin/principal dump --v23.credentials=./credentials -s=true))
- $(eval email := $(subst dev.v.io/u/,,$(blessing)))
+ $(eval email := $(subst dev.v.io:u:,,$(blessing)))
./bin/syncbased \
--v=5 \
--alsologtostderr=false \
