Issue268

build.gradle

@@ -7,6 +7,7 @@ buildscript {
 
     dependencies {
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0"
+        classpath 'com.android.tools.build:gradle:3.4.0'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,10 +1,10 @@
-#Tue May 15 18:45:24 EAT 2018
+#Mon Jul 15 16:46:41 BDT 2019
 org.gradle.daemon=true
 zipStorePath=wrapper/dists
 org.gradle.parallel=true
 zipStoreBase=GRADLE_USER_HOME
 org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
 org.gradle.configureondemand=true
 distributionPath=wrapper/dists
 distributionBase=GRADLE_USER_HOME

opensrp-app/AndroidManifest.xml

@@ -18,9 +18,6 @@
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="16" />
 
     <application
         android:label="@string/app_name"

opensrp-app/src/main/java/org/smartregister/cursoradapter/RecyclerViewFragment.java

@@ -64,7 +64,9 @@ public abstract class RecyclerViewFragment extends
     public String mainCondition = "";
     public String Sortqueries;
     public String tablename;
+
     public String countSelect;
+    public String registerCondition = "";
     public String joinTable = "";
     public String joinTables[];
     public RecyclerView clientsView;
@@ -450,12 +452,22 @@ private String filterandSortJoinArrayQuery() {
         String query = "";
         try {
             if (isValidFilterForFts(commonRepository())) {
-                String sql = sqb
-                        .searchQueryFts(tablename, joinTables, mainCondition, filters, Sortqueries,
-                                clientAdapter.getCurrentlimit(), clientAdapter.getCurrentoffset());
-                List<String> ids = commonRepository().findSearchIds(sql);
-                query = sqb.toStringFts(ids, tablename, CommonRepository.ID_COLUMN,
-                        Sortqueries);
+                String sql;
+                List<String> ids;
+                if(StringUtils.isBlank(registerCondition)){
+                    sql = sqb
+                            .searchQueryFts(tablename, joinTables, mainCondition, filters, Sortqueries,
+                                    clientAdapter.getCurrentlimit(), clientAdapter.getCurrentoffset());
+                    ids =  commonRepository().findSearchIds(sql);
+                    query = sqb.toStringFts(ids, tablename, CommonRepository.ID_COLUMN,
+                            Sortqueries);
+                }else{
+                    sql = sqb.searchQueryFts(tablename,mainSelect,mainCondition,registerCondition,joinTables,filters,Sortqueries,clientAdapter.getCurrentlimit(), clientAdapter.getCurrentoffset());
+                    ids =  commonRepository().findSearchIds(sql);
+                    query = sqb.toStringFts(ids, tablename, CommonRepository.ID_COLUMN,
+                            Sortqueries,registerCondition);
+                }
+
                 query = sqb.Endquery(query);
             } else {
                 sqb.addCondition(filters);
@@ -477,7 +489,12 @@ public void countExecute() {
             SmartRegisterQueryBuilder sqb = new SmartRegisterQueryBuilder(countSelect);
             String query = "";
             if (isValidFilterForFts(commonRepository())) {
-                String sql = sqb.countQueryFts(tablename, joinTable, mainCondition, filters);
+                String sql = "";
+                if(StringUtils.isBlank(registerCondition)) {
+                    sql = sqb.countQueryFts(tablename, joinTable, mainCondition, filters);
+                }else{
+                    sql = countSelect;
+                }
                 Log.i(getClass().getName(), query);
 
                 clientAdapter.setTotalcount(commonRepository().countSearchIds(sql));

opensrp-app/src/main/java/org/smartregister/cursoradapter/SmartRegisterQueryBuilder.java

@@ -3,6 +3,7 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.smartregister.commonregistry.CommonFtsObject;
+import org.smartregister.util.StringUtil;
 
 import java.util.List;
 
@@ -175,7 +176,40 @@ public String toStringFts(List<String> ids, String idColumn) {
 
         return res;
     }
+    public String toStringFts(List<String> foundIds, String tName, String idCol, String sortBy,String condition) {
+        String res = Selectquery;
+        List<String> ids = foundIds;
+        String tableName = tName;
+        String idColumn = idCol;
+        String sort = sortBy;
 
+        if (StringUtils.containsIgnoreCase(res, "JOIN") && StringUtils.isNotBlank(tableName)) {
+            idColumn = tableName + "." + idColumn;
+            if (StringUtils.isNotBlank(sort)) {
+                sort = tableName + "." + sort;
+            }
+        }
+        // Remove where clause, Already used when fetching ids
+        if (StringUtils.containsIgnoreCase(res, "WHERE")) {
+            res = res.substring(0, res.toUpperCase().lastIndexOf("WHERE"));
+        }
+
+        if (ids.isEmpty()) {
+            res += String.format(" WHERE %s IN () ", idColumn);
+        } else {
+            String joinedIds = "'" + StringUtils.join(ids, "','") + "'";
+            res += String.format(" WHERE %s IN (%s) ", idColumn, joinedIds);
+
+            if(StringUtils.isNotBlank(condition)){
+                res += " AND " + condition;
+            }
+            if (StringUtils.isNotBlank(sort)) {
+                res += " ORDER BY " + sort;
+            }
+        }
+
+        return res;
+    }
     public String toStringFts(List<String> foundIds, String tName, String idCol, String sortBy) {
         String res = Selectquery;
         List<String> ids = foundIds;
@@ -293,6 +327,25 @@ private String phraseClause(String tableName, String joinTable[], String mainCon
         return phraseClause;
     }
 
+    public String searchQueryFts(String tablename,String mainselect,String mainCondition,String condition,String searchJoinTable[],String searchFilter, String sort,int limit, int offset) {
+
+        String search_phrase = "";
+        if(StringUtils.isNotBlank(searchFilter)){
+            search_phrase = phraseClause(tablename, searchJoinTable,
+                    mainCondition, searchFilter);
+            search_phrase = search_phrase.replaceFirst("WHERE"," AND ");
+            search_phrase = search_phrase.replaceFirst(CommonFtsObject.idColumn," id ");
+        }
+
+        String query;
+        if(mainselect.contains(mainCondition)){
+            query = mainselect + " AND " + condition + " "  +search_phrase  + orderByClause(sort) + limitClause(limit, offset);
+        }else{
+            query = mainselect + " WHERE " + mainCondition + " AND " + condition +  search_phrase + orderByClause(sort) + limitClause(limit, offset);
+        }
+
+        return query;
+    }
     public String searchQueryFts(String tablename, String searchJoinTable[], String mainCondition,
                                  String searchFilter, String sort, int limit, int offset) {
         if (ArrayUtils.isNotEmpty(searchJoinTable) && StringUtils.isNotBlank(searchFilter)) {

opensrp-app/src/main/java/org/smartregister/service/UserService.java

@@ -297,7 +297,7 @@ public LoginResponse isValidRemoteLogin(String userName, String password) {
         LoginResponse loginResponse = httpAgent
                 .urlCanBeAccessWithGivenCredentials(requestURL, userName, password);
 
-        if (loginResponse.equals(LoginResponse.SUCCESS)) {
+        if (loginResponse!=null&&loginResponse.equals(LoginResponse.SUCCESS)) {
             saveUserGroup(userName, password, loginResponse.payload());
         }
 

sample/src/main/java/org/smartregister/sample/MainActivity.java

@@ -130,4 +130,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         return super.onOptionsItemSelected(item);
     }
-}
+}