Feat: OONI Run v2 API Bootstrap

app/src/main/java/org/openobservatory/ooniprobe/common/LocaleUtils.java

@@ -10,7 +10,7 @@
 public class LocaleUtils {
 
 
-    private static Locale sLocale;
+    public static Locale sLocale;
 
     public static void setLocale(Locale locale) {
         sLocale = locale;

app/src/main/java/org/openobservatory/ooniprobe/domain/MapConverter.java

@@ -0,0 +1,25 @@
+package org.openobservatory.ooniprobe.domain;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.raizlabs.android.dbflow.converter.TypeConverter;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+
+@com.raizlabs.android.dbflow.annotation.TypeConverter
+public class MapConverter extends TypeConverter<String, HashMap> {
+    @Override
+    public String getDBValue(HashMap model) {
+        return new Gson().toJson(model);
+    }
+
+    @Override
+    public HashMap getModelValue(String json) {
+        Gson gson = new Gson();
+        Type type = new TypeToken<HashMap<String, String>>() {
+        }.getType();
+        HashMap<String, String> map = gson.fromJson(json, type);
+        return map;
+    }
+}

app/src/main/java/org/openobservatory/ooniprobe/domain/TestDescriptorManager.java

@@ -62,8 +62,9 @@ public static FetchTestDescriptorResponse fetchDataFromRunId(long runId, Context
                 .withName(descriptor.getName())
                 .withNameIntl(descriptor.getNameIntl())
                 .withShortDescription(descriptor.getShortDescription())
+                .withShortDescriptionIntl(descriptor.getShortDescriptionIntl())
                 .withDescription(descriptor.getDescription())
-                .withDescriptionIntl(descriptor.getDescriptionIntl().toString())
+                .withDescriptionIntl(descriptor.getDescriptionIntl())
                 .withIcon(descriptor.getIcon())
                 .withArchived(descriptor.getArchived())
                 .withAuthor(descriptor.getAuthor())

app/src/main/java/org/openobservatory/ooniprobe/model/database/TestDescriptor.java

@@ -1,17 +1,18 @@
 package org.openobservatory.ooniprobe.model.database;
 
 import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ConflictAction;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
 import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.annotation.Unique;
 import com.raizlabs.android.dbflow.structure.BaseModel;
 
-import org.openobservatory.engine.OONIRunNettest;
 import org.openobservatory.ooniprobe.common.AppDatabase;
+import org.openobservatory.ooniprobe.common.LocaleUtils;
+import org.openobservatory.ooniprobe.common.MapUtility;
+import org.openobservatory.ooniprobe.domain.MapConverter;
 import org.openobservatory.ooniprobe.domain.NettestConverter;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
 
 @Table(database = AppDatabase.class)
@@ -22,17 +23,20 @@ public class TestDescriptor extends BaseModel implements Serializable {
     @Column
     private String name;
 
-    @Column(name = "name_intl")
-    private String nameIntl;
-
-    @Column
-    private String description;
+    @Column(name = "name_intl", typeConverter = MapConverter.class)
+    private HashMap nameIntl;
 
     @Column(name = "short_description")
     private String shortDescription;
 
-    @Column(name = "description_intl")
-    private String descriptionIntl;
+    @Column(name = "short_description_intl", typeConverter = MapConverter.class)
+    private HashMap shortDescriptionIntl;
+
+    @Column
+    private String description;
+
+    @Column(name = "description_intl", typeConverter = MapConverter.class)
+    private HashMap descriptionIntl;
 
     @Column
     private String icon;
@@ -55,42 +59,50 @@ public void setRunId(long runId) {
     }
 
     public String getName() {
-        return name;
+        return MapUtility.getOrDefaultCompat(nameIntl, LocaleUtils.sLocale.getLanguage(), name).toString();
     }
 
     public void setName(String name) {
         this.name = name;
     }
 
-    public String getNameIntl() {
+    public HashMap getNameIntl() {
         return nameIntl;
     }
 
-    public void setNameIntl(String nameIntl) {
+    public void setNameIntl(HashMap nameIntl) {
         this.nameIntl = nameIntl;
     }
 
-    public String getDescription() {
-        return description;
+    public String getShortDescription() {
+        return MapUtility.getOrDefaultCompat(shortDescriptionIntl, LocaleUtils.sLocale.getLanguage(), shortDescription).toString();
     }
 
-    public void setDescription(String description) {
-        this.description = description;
+    public void setShortDescription(String shortDescription) {
+        this.shortDescription = shortDescription;
     }
 
-    public String getShortDescription() {
-        return shortDescription;
+    public HashMap getShortDescriptionIntl() {
+        return shortDescriptionIntl;
     }
 
-    public void setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
+    public void setShortDescriptionIntl(HashMap shortDescriptionIntl) {
+        this.shortDescriptionIntl = shortDescriptionIntl;
+    }
+
+    public String getDescription() {
+        return MapUtility.getOrDefaultCompat(descriptionIntl, LocaleUtils.sLocale.getLanguage(), description).toString();
     }
 
-    public String getDescriptionIntl() {
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public HashMap getDescriptionIntl() {
         return descriptionIntl;
     }
 
-    public void setDescriptionIntl(String descriptionIntl) {
+    public void setDescriptionIntl(HashMap descriptionIntl) {
         this.descriptionIntl = descriptionIntl;
     }
 
@@ -130,10 +142,11 @@ public void setNettests(List nettests) {
     public static final class Builder {
         private long runId;
         private String name;
-        private String nameIntl;
-        private String description;
+        private HashMap nameIntl;
         private String shortDescription;
-        private String descriptionIntl;
+        private HashMap shortDescriptionIntl;
+        private String description;
+        private HashMap descriptionIntl;
         private String icon;
         private String author;
         private boolean archived;
@@ -156,22 +169,27 @@ public Builder withName(String name) {
             return this;
         }
 
-        public Builder withNameIntl(String nameIntl) {
+        public Builder withNameIntl(HashMap nameIntl) {
             this.nameIntl = nameIntl;
             return this;
         }
 
-        public Builder withDescription(String description) {
-            this.description = description;
+        public Builder withShortDescription(String shortDescription) {
+            this.shortDescription = shortDescription;
             return this;
         }
 
-        public Builder withShortDescription(String shortDescription) {
-            this.shortDescription = shortDescription;
+        public Builder withShortDescriptionIntl(HashMap shortDescriptionIntl) {
+            this.shortDescriptionIntl = shortDescriptionIntl;
             return this;
         }
 
-        public Builder withDescriptionIntl(String descriptionIntl) {
+        public Builder withDescription(String description) {
+            this.description = description;
+            return this;
+        }
+
+        public Builder withDescriptionIntl(HashMap descriptionIntl) {
             this.descriptionIntl = descriptionIntl;
             return this;
         }
@@ -201,8 +219,9 @@ public TestDescriptor build() {
             testDescriptor.setRunId(runId);
             testDescriptor.setName(name);
             testDescriptor.setNameIntl(nameIntl);
-            testDescriptor.setDescription(description);
             testDescriptor.setShortDescription(shortDescription);
+            testDescriptor.setShortDescriptionIntl(shortDescriptionIntl);
+            testDescriptor.setDescription(description);
             testDescriptor.setDescriptionIntl(descriptionIntl);
             testDescriptor.setIcon(icon);
             testDescriptor.setAuthor(author);

engine/src/main/java/org/openobservatory/engine/OONIRunFetchResponse.kt

@@ -2,6 +2,7 @@ package org.openobservatory.engine
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable
+import java.util.HashMap
 
 data class OONIRunFetchResponse(
     @JvmField
@@ -14,15 +15,16 @@ data class OONIRunDescriptor(
     val author: String,
     val description: String,
     @SerializedName("description_intl")
-    val descriptionIntl: Map<String, String>,
+    val descriptionIntl: HashMap<String, String>,
     val icon: String,
     val name: String,
-    val nameIntl: String,
+    @SerializedName("name_intl")
+    val nameIntl: HashMap<String, String>,
     val archived: Boolean,
     @SerializedName("short_description")
     val shortDescription: String,
     @SerializedName("short_description_intl")
-    val shortDescriptionIntl:  Map<String, String>,
+    val shortDescriptionIntl: HashMap<String, String>,
     val nettests: List<OONIRunNettest>
 ) : Serializable
 

engine/src/main/java/org/openobservatory/engine/PESession.java

@@ -1,5 +1,7 @@
 package org.openobservatory.engine;
 
+import android.util.Log;
+
 import com.google.gson.Gson;
 
 import oonimkall.Oonimkall;
@@ -17,7 +19,9 @@ public OONIContext newContext() {
     }
 
 	public OONIRunFetchResponse ooniRunFetch(OONIContext ctx, long id) throws Exception {
-		return new Gson().fromJson(session.ooniRunFetch(ctx.ctx,id),OONIRunFetchResponse.class);
+        String response = session.ooniRunFetch(ctx.ctx,id);
+        Log.d(PESession.class.getName(), response);
+		return new Gson().fromJson(response, OONIRunFetchResponse.class);
 	}
 
 	public OONIContext newContextWithTimeout(long timeout) {