Horizontal-org
diff --git a/‎build.gradle‎
Lines changed: 1 addition & 0 deletions b/‎build.gradle‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎gradle.properties‎
Lines changed: 1 addition & 0 deletions b/‎gradle.properties‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎mobile/build.gradle‎
Lines changed: 2 additions & 3 deletions b/‎mobile/build.gradle‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎mobile/src/main/AndroidManifest.xml‎
Lines changed: 1 addition & 1 deletion b/‎mobile/src/main/AndroidManifest.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎mobile/src/main/java/rs/readahead/washington/mobile/MyApplication.java‎
Lines changed: 3 additions & 40 deletions b/‎mobile/src/main/java/rs/readahead/washington/mobile/MyApplication.java‎
Lines changed: 3 additions & 40 deletions
diff --git a/‎mobile/src/main/java/rs/readahead/washington/mobile/data/ParamsNetwork.kt‎
Lines changed: 1 addition & 0 deletions b/‎mobile/src/main/java/rs/readahead/washington/mobile/data/ParamsNetwork.kt‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎mobile/src/main/java/rs/readahead/washington/mobile/data/database/UwaziDataSource.java‎
Lines changed: 12 additions & 13 deletions b/‎mobile/src/main/java/rs/readahead/washington/mobile/data/database/UwaziDataSource.java‎
Lines changed: 12 additions & 13 deletions
diff --git a/‎mobile/src/main/java/rs/readahead/washington/mobile/data/entity/uwazi/RelationShipEntitiesResponse.kt‎
Lines changed: 5 additions & 0 deletions b/‎mobile/src/main/java/rs/readahead/washington/mobile/data/entity/uwazi/RelationShipEntitiesResponse.kt‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎mobile/src/main/java/rs/readahead/washington/mobile/data/entity/uwazi/UwaziRelationShipRow.kt‎
Lines changed: 9 additions & 0 deletions b/‎mobile/src/main/java/rs/readahead/washington/mobile/data/entity/uwazi/UwaziRelationShipRow.kt‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎mobile/src/main/java/rs/readahead/washington/mobile/data/entity/uwazi/Value.kt‎
Lines changed: 6 additions & 0 deletions b/‎mobile/src/main/java/rs/readahead/washington/mobile/data/entity/uwazi/Value.kt‎
Lines changed: 6 additions & 0 deletions
@@ -72,6 +72,7 @@ buildscript {
     versions.permissionDispatcher = "4.8.0"
     versions.googlePlayServices = "17.0.0"
     versions.pdf_viewer = "2.8.2"
+    versions.divviup = "0.2.0"
 
     repositories {
         mavenCentral()
 
@@ -22,3 +22,4 @@ org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+android.bundle.enableUncompressedNativeLibs = false
@@ -14,8 +14,8 @@ android {
         minSdkVersion versions.minSdk
         compileSdkVersion versions.compileSdk
         targetSdkVersion versions.targetSdk
-        versionCode 181
-        versionName "2.9.0"
+        versionCode 184
+        versionName "2.10.0"
         multiDexEnabled true
 
         ndk {
@@ -82,7 +82,6 @@ dependencies {
     implementation "androidx.multidex:multidex:$versions.multidex"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':tella-vault')
-    implementation project(':clean-insights')
     implementation project(':pdfviewer')
 
     api project(':tella-locking-ui')
 
@@ -622,7 +622,7 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name=".views.activity.clean_insights.CleanInsightsActivity"
+            android:name=".views.activity.analytics.AnalyticsIntroActivity"
             android:theme="@style/AppTheme.NoActionBar" />
 
         <activity
 
@@ -31,10 +31,10 @@
 import com.hzontal.tella_vault.Vault;
 import com.hzontal.tella_vault.rx.RxVault;
 
+import org.hzontal.shared_ui.data.CommonPrefs;
 
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
-import org.cleaninsights.sdk.CleanInsights;
 import org.hzontal.tella.keys.MainKeyStore;
 import org.hzontal.tella.keys.TellaKeys;
 import org.hzontal.tella.keys.config.IUnlockRegistryHolder;
@@ -63,7 +63,6 @@
 import rs.readahead.washington.mobile.javarosa.PropertyManager;
 import rs.readahead.washington.mobile.media.MediaFileHandler;
 import rs.readahead.washington.mobile.util.C;
-import rs.readahead.washington.mobile.util.CleanInsightUtils;
 import rs.readahead.washington.mobile.util.LocaleManager;
 import rs.readahead.washington.mobile.util.TellaUpgrader;
 import rs.readahead.washington.mobile.views.activity.ExitActivity;
@@ -81,7 +80,6 @@ public class MyApplication extends MultiDexApplication implements IUnlockRegistr
     private static MainKeyStore mainKeyStore;
     private static UnlockRegistry unlockRegistry;
     private static KeyDataSource keyDataSource;
-    private static CleanInsights cleanInsights;
     private final Long start = System.currentTimeMillis();
     @Inject
     public HiltWorkerFactory workerFactory;
@@ -149,12 +147,9 @@ public static void initKeys(MainKey mainKey) {
         TellaKeysUI.getMainKeyHolder().set(mainKey);
     }
 
-    public static CleanInsights getCleanInsights() {
-        return cleanInsights;
-    }
-
     @Override
     protected void attachBaseContext(Context newBase) {
+        CommonPrefs.getInstance().init(newBase);
         SharedPrefs.getInstance().init(newBase);
         super.attachBaseContext(LocaleManager.getInstance().getLocalizedContext(newBase));
     }
@@ -176,6 +171,7 @@ public void onCreate() {
             apiBuilder.setLogLevelFull();
         }
         // todo: implement dagger2
+        CommonPrefs.getInstance().init(this);
         SharedPrefs.getInstance().init(this);
         configureCrashlytics();
         System.loadLibrary("sqlcipher");
@@ -204,10 +200,6 @@ public void accept(Throwable throwable) {
         MediaFileHandler.init(this);
         MediaFileHandler.emptyTmp(this);
 
-        /* evernote jobs */
-        //    JobManager.create(this).addJobCreator(new TellaJobCreator());
-        //  JobManager.instance().cancelAll(); // for testing, kill them all for now..
-
         // Collect
         PropertyManager mgr = new PropertyManager();
         JavaRosa.initializeJavaRosa(mgr);
@@ -221,7 +213,6 @@ public void accept(Throwable throwable) {
         mainKeyHolder = new LifecycleMainKey(ProcessLifecycleOwner.get().getLifecycle(), Preferences.getLockTimeout());
         keyDataSource = new KeyDataSource(getApplicationContext());
         TellaKeysUI.initialize(mainKeyStore, mainKeyHolder, unlockRegistry, this, Preferences.getFailedUnlockOption(), Preferences.getUnlockRemainingAttempts(), Preferences.isShowUnlockRemainingAttempts());
-        //initCleanInsights();
     }
 
     private void configureCrashlytics() {
@@ -264,7 +255,6 @@ public void onLowMemory() {
         super.onLowMemory();
         super.onLowMemory();
         Glide.get(this).clearMemory();
-        persistCleanInsights();
     }
 
     @Override
@@ -333,33 +323,6 @@ public UnlockRegistry getUnlockRegistry() {
         return unlockRegistry;
     }
 
-    /*  private void initCleanInsights() {
-          if (Preferences.hasAcceptedImprovements()) {
-              try {
-                  cleanInsights = createCleanInsightsInstance(getApplicationContext(), Preferences.getTimeAcceptedImprovements());
-              } catch (Exception e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-  */
-    @Override
-    public void onTrimMemory(int level) {
-        super.onTrimMemory(level);
-        persistCleanInsights();
-    }
-
-    private void persistCleanInsights() {
-        if (Preferences.hasAcceptedImprovements() && cleanInsights != null)
-            CleanInsightUtils.INSTANCE.measureTimeSpentEvent(start);
-    }
-
-    @Override
-    public void onTerminate() {
-        super.onTerminate();
-        persistCleanInsights();
-    }
-
     @NonNull
     @Override
     public Configuration getWorkManagerConfiguration() {
 
@@ -3,6 +3,7 @@ package rs.readahead.washington.mobile.data
 object ParamsNetwork {
     private const val URL_API = "/api/"
     const val URL_LOGIN = "${URL_API}login"
+    const val URL_THESAURIS = "${URL_API}thesauris"
     const val URL_TEMPLATES = "${URL_API}templates"
     const val URL_ENTITIES = "${URL_API}entities"
     const val URL_WHITE_LISTED_ENTITIES = "${URL_API}public"
 
@@ -37,6 +37,7 @@
 import rs.readahead.washington.mobile.domain.entity.uwazi.ListTemplateResult;
 import rs.readahead.washington.mobile.domain.entity.uwazi.UwaziEntityInstance;
 import rs.readahead.washington.mobile.domain.entity.uwazi.UwaziRow;
+import rs.readahead.washington.mobile.domain.entity.uwazi.Value;
 import rs.readahead.washington.mobile.domain.exception.NotFountException;
 import rs.readahead.washington.mobile.domain.repository.IUWAZIServersRepository;
 import rs.readahead.washington.mobile.domain.repository.uwazi.ICollectUwaziTemplatesRepository;
@@ -176,7 +177,7 @@ public Single<List<CollectTemplate>> listFavoriteTemplates() {
     @Override
     public Single<ListTemplateResult> updateBlankTemplates(ListTemplateResult listTemplateResult) {
         return Single.fromCallable(() -> {
-            dataSource.updateUBlankTemplates(listTemplateResult,dataSource.getBlankCollectTemplates());
+            dataSource.updateUBlankTemplates(listTemplateResult, dataSource.getBlankCollectTemplates());
             listTemplateResult.setTemplates(dataSource.getBlankCollectTemplates());
             return listTemplateResult;
         }).compose(applySchedulers());
@@ -185,7 +186,7 @@ public Single<ListTemplateResult> updateBlankTemplates(ListTemplateResult listTe
     @Override
     public Single<ListTemplateResult> updateBlankTemplatesIfNeeded(ListTemplateResult listTemplateResult) {
         return Single.fromCallable(() -> {
-            dataSource.updateUBlankTemplates(listTemplateResult,dataSource.getBlankCollectTemplates());
+            dataSource.updateUBlankTemplates(listTemplateResult, dataSource.getBlankCollectTemplates());
             listTemplateResult.setTemplates(dataSource.getBlankCollectTemplatesAndUpdate(listTemplateResult));
             return listTemplateResult;
         }).compose(applySchedulers());
@@ -384,10 +385,8 @@ private List<CollectTemplate> getBlankCollectTemplates() {
                 boolean updated = cursor.getInt(cursor.getColumnIndexOrThrow(D.C_UPDATED)) == 1;
                 String serverName = cursor.getString(cursor.getColumnIndexOrThrow(D.A_SERVER_NAME));
                 String username = cursor.getString(cursor.getColumnIndexOrThrow(D.A_SERVER_USERNAME));
-
                 CollectTemplate collectTemplate = new CollectTemplate(id, serverId, serverName, username, entity, downloaded, favorite, updated);
 
-
                 templates.add(collectTemplate);
             }
         } catch (Exception e) {
@@ -431,7 +430,6 @@ private List<CollectTemplate> getBlankCollectTemplatesAndUpdate(ListTemplateResu
             for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 UwaziRow entity = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(D.C_TEMPLATE_ENTITY)), new TypeToken<UwaziRow>() {
                 }.getType());
-
                 // todo: implement cursorToCollectForm
                 long id = cursor.getLong(cursor.getColumnIndexOrThrow(D.A_COLLECT_BLANK_FORM_ID));
                 long serverId = cursor.getLong(cursor.getColumnIndexOrThrow(D.C_UWAZI_SERVER_ID));
@@ -467,14 +465,14 @@ private List<CollectTemplate> getBlankCollectTemplatesAndUpdate(ListTemplateResu
 
     }
 
-    private void updateUBlankTemplates(ListTemplateResult result,List<CollectTemplate> oldList) {
+    private void updateUBlankTemplates(ListTemplateResult result, List<CollectTemplate> oldList) {
 
         List<CollectTemplate> templates = result.getTemplates();
 
         for (CollectTemplate template : templates) {
             ContentValues values = new ContentValues();
-            for (CollectTemplate oldTemplate : oldList){
-                if (oldTemplate.getEntityRow().get_id().equals(template.getEntityRow().get_id())){
+            for (CollectTemplate oldTemplate : oldList) {
+                if (oldTemplate.getEntityRow().get_id().equals(template.getEntityRow().get_id())) {
                     values.put(D.C_UWAZI_SERVER_ID, template.getServerId());
                     values.put(D.C_TEMPLATE_ENTITY, new GsonBuilder().create().toJson(template.getEntityRow()));
                     values.put(D.C_DOWNLOADED, true);
@@ -528,7 +526,6 @@ private CollectTemplate getBlankTemplate(String templateID) {
                 String username = cursor.getString(cursor.getColumnIndexOrThrow(D.A_SERVER_USERNAME));
                 UwaziRow entity = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(D.C_TEMPLATE_ENTITY)), new TypeToken<UwaziRow>() {
                 }.getType());
-
                 return new CollectTemplate(id, serverId, serverName, username, entity, downloaded, favorite, updated);
             }
         } catch (Exception e) {
@@ -573,7 +570,7 @@ private CollectTemplate saveUBlankTemplate(CollectTemplate template) {
         return template;
     }
 
-    private UwaziEntityInstance   updateEntityInstanceDB(UwaziEntityInstance instance) {
+    private UwaziEntityInstance updateEntityInstanceDB(UwaziEntityInstance instance) {
         try {
             ContentValues values = new ContentValues();
             long updated = Util.currentTimestamp();
@@ -595,7 +592,7 @@ private UwaziEntityInstance   updateEntityInstanceDB(UwaziEntityInstance instanc
             instance.setUpdated(updated);
 
             if (instance.getStatus() == EntityStatus.UNKNOWN) {
-                statusOrdinal =  EntityStatus.DRAFT.ordinal();
+                statusOrdinal = EntityStatus.DRAFT.ordinal();
             } else {
                 statusOrdinal = instance.getStatus().ordinal();
             }
@@ -678,7 +675,8 @@ private EntityInstanceBundle getEntityInstanceBundle(long id) {
 
                 CollectTemplate collectTemplate = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(D.C_TEMPLATE_ENTITY)), CollectTemplate.class);
                 instance.setCollectTemplate(collectTemplate);
-                Map<String,ArrayList<Object>> metadata = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(D.C_METADATA)), new TypeToken<Map<String,ArrayList<Object>>>() {}.getType());
+                Map<String, ArrayList<Object>> metadata = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(D.C_METADATA)), new TypeToken<Map<String, ArrayList<Object>>>() {
+                }.getType());
                 instance.setMetadata(metadata);
                 bundle.setInstance(instance);
 
@@ -769,7 +767,8 @@ private List<UwaziEntityInstance> getUwaziEntityInstances(EntityStatus[] statuse
                 UwaziEntityInstance instance = cursorToUwaziEntityInstance(cursor);
                 CollectTemplate collectTemplate = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(D.C_TEMPLATE_ENTITY)), CollectTemplate.class);
                 instance.setCollectTemplate(collectTemplate);
-                Map<String,ArrayList<Object>> metadata = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(D.C_METADATA)), new TypeToken<Map<String,ArrayList<Object>>>() {}.getType());
+                Map<String, ArrayList<Object>> metadata = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(D.C_METADATA)), new TypeToken<Map<String, ArrayList<Object>>>() {
+                }.getType());
                 instance.setMetadata(metadata);
 
                 instances.add(instance);
 
@@ -0,0 +1,5 @@
+package rs.readahead.washington.mobile.data.entity.uwazi
+
+data class RelationShipEntitiesResponse(
+    val rows: List<UwaziRelationShipRow>?
+)
@@ -0,0 +1,9 @@
+package rs.readahead.washington.mobile.data.entity.uwazi
+data class UwaziRelationShipRow(
+    val _id: String,
+    val name: String,
+    val values: List<Value>?,
+    val __v: Int,
+    val type: String?,
+    val entityViewPage: String?,
+)
@@ -0,0 +1,6 @@
+package rs.readahead.washington.mobile.data.entity.uwazi
+
+data class Value(
+    val label: String,
+    val id: String
+)