remove DB's redundant call
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/92b7050e Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/92b7050e Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/92b7050e Branch: refs/heads/master Commit: 92b7050eb02a5708cd859b29388d572f5506bba6 Parents: 979f89a Author: Sagar <[email protected]> Authored: Mon Jul 25 17:02:54 2016 +0530 Committer: Sagar <[email protected]> Committed: Mon Jul 25 17:02:54 2016 +0530 ---------------------------------------------------------------------- .../apache/taverna/mobile/data/DataManager.java | 8 ----- .../taverna/mobile/data/local/DBHelper.java | 31 -------------------- 2 files changed, 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/92b7050e/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java index 3cb1c89..b02152f 100644 --- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java @@ -133,13 +133,5 @@ public class DataManager { return mDBHelper.getFavouriteWorkflowDetail(id); } - /** - * @param id is the id of workflow - * @return all URI of workflow Image from DBhelper - */ - - public Observable<Map<String, String>> getImageURI(String id) { - return mDBHelper.getImageURI(id); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/92b7050e/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java index 61d392f..f50c3fa 100644 --- a/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/local/DBHelper.java @@ -22,15 +22,12 @@ package org.apache.taverna.mobile.data.local; import android.support.annotation.Nullable; import com.raizlabs.android.dbflow.sql.language.SQLite; -import com.raizlabs.android.dbflow.sql.language.Select; import org.apache.taverna.mobile.data.model.Workflow; import org.apache.taverna.mobile.data.model.Workflow_Table; import org.apache.taverna.mobile.data.model.Workflows; -import java.util.HashMap; import java.util.List; -import java.util.Map; import rx.Observable; import rx.Subscriber; @@ -225,34 +222,6 @@ public class DBHelper { } - public Observable<Map<String, String>> getImageURI(final String id) { - return Observable.defer(new Func0<Observable<Map<String, String>>>() { - @Override - public Observable<Map<String, String>> call() { - - Map<String, String> URI = new HashMap<String, String>(); - - Workflow workflow = - new Select(Workflow_Table.svgUri, Workflow_Table - .previewUri) - .from(Workflow.class) - .where(Workflow_Table.id.eq(id)) - .querySingle(); - - if (workflow != null) { - - URI.put(SVG_URI, workflow.getSvgUri()); - URI.put(JPG_URI, workflow.getPreviewUri()); - - return Observable.just(URI); - } else { - - return Observable.just(URI); - } - - } - }); - } }
