Starting the use of dhis2-android-sdk. Removing old sdk module. Adapt…

…ing existing code base to it.
dhis2 · Sep 14, 2015 · 10bca60 · 10bca60
1 parent 53cd068
commit 10bca60
Show file tree

Hide file tree

Showing 75 changed files with 159 additions and 5,126 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,7 +28,7 @@ android {
 }
 
 dependencies {
-    compile project(':sdk')
+    compile project(':core')
     compile 'com.android.support:appcompat-v7:22.1.1'
     compile 'com.jakewharton:butterknife:6.1.0'
     compile 'com.squareup:otto:1.3.6'

diff --git a/app/src/main/java/org/hisp/dhis/android/datacapture/DataCaptureApplication.java b/app/src/main/java/org/hisp/dhis/android/datacapture/DataCaptureApplication.java
@@ -28,29 +28,26 @@
 
 package org.hisp.dhis.android.datacapture;
 
-import org.hisp.dhis.android.datacapture.sdk.DhisApplication;
-import org.hisp.dhis.android.datacapture.sdk.DhisManager;
+import android.app.Application;
+
 import org.hisp.dhis.android.datacapture.utils.EventBus;
+import org.hisp.dhis.android.sdk.core.api.Dhis2;
+
+public class DataCaptureApplication extends Application {
 
-public class DataCaptureApplication extends DhisApplication {
     private DhisService mDhisService;
-    private DhisManager mDhisManager;
 
     @Override
     public void onCreate() {
         super.onCreate();
 
         EventBus.register(this);
-        DhisManager.init(getBaseContext());
-        mDhisManager = DhisManager.getInstance();
-        mDhisService = new DhisService(mDhisManager);
-    }
+        Dhis2.init(getBaseContext());
 
-    public DhisService getDhisService() {
-        return mDhisService;
+        mDhisService = new DhisService();
     }
 
-    public DhisManager getDhisManager() {
-        return mDhisManager;
+    public DhisService getService() {
+        return mDhisService;
     }
 }
diff --git a/app/src/main/java/org/hisp/dhis/android/datacapture/DhisService.java b/app/src/main/java/org/hisp/dhis/android/datacapture/DhisService.java
@@ -33,12 +33,10 @@
 import org.hisp.dhis.android.datacapture.api.job.base.Job;
 import org.hisp.dhis.android.datacapture.api.job.base.JobExecutor;
 import org.hisp.dhis.android.datacapture.api.job.base.NetworkJob;
-import org.hisp.dhis.android.datacapture.sdk.DhisManager;
-import org.hisp.dhis.android.datacapture.sdk.network.APIException;
-import org.hisp.dhis.android.datacapture.sdk.network.models.Credentials;
-import org.hisp.dhis.android.datacapture.sdk.persistence.models.UserAccount;
-
-import static org.hisp.dhis.android.datacapture.sdk.utils.Preconditions.isNull;
+import org.hisp.dhis.android.sdk.core.api.Dhis2;
+import org.hisp.dhis.android.sdk.core.network.APIException;
+import org.hisp.dhis.android.sdk.core.persistence.models.common.meta.Credentials;
+import org.hisp.dhis.android.sdk.models.user.UserAccount;
 
 public final class DhisService {
     public static final int LOG_IN_JOB_ID = 1;
@@ -47,18 +45,12 @@ public final class DhisService {
 
     public static final int SYNC_META_DATA = 4;
 
-    private DhisManager mDhisManager;
-
-    public DhisService(DhisManager dhisManager) {
-        mDhisManager = isNull(dhisManager, "DhisManager must not be null");
-    }
-
     public void logInUser(final HttpUrl serverUrl, final Credentials credentials) {
         JobExecutor.enqueueJob(new NetworkJob<UserAccount>(LOG_IN_JOB_ID) {
 
             @Override
             public UserAccount execute() throws APIException {
-                return mDhisManager.logInUser(serverUrl, credentials);
+                return Dhis2.logIn(serverUrl, credentials);
             }
         });
     }
@@ -73,7 +65,7 @@ public UserAccount execute() throws APIException {
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }
-                return mDhisManager.confirmUser(credentials);
+                return Dhis2.confirmUser(credentials);
             }
         });
     }
@@ -83,7 +75,7 @@ public void logOutUser() {
         JobExecutor.enqueueJob(new Job<Object>(LOG_OUT_JOB_ID) {
             @Override
             public Object inBackground() {
-                mDhisManager.logOutUser();
+                Dhis2.logOut();
                 return new Object();
             }
         });
@@ -94,7 +86,7 @@ public void syncMetaData() {
 
             @Override
             public Object execute() throws APIException {
-                mDhisManager.syncMetaData();
+                // Dhis2.syncMetaData();
                 return new Object();
             }
         });

diff --git a/app/src/main/java/org/hisp/dhis/android/datacapture/api/job/base/Job.java b/app/src/main/java/org/hisp/dhis/android/datacapture/api/job/base/Job.java
@@ -30,15 +30,13 @@
 
 import android.os.AsyncTask;
 
-import static org.hisp.dhis.android.datacapture.sdk.utils.Preconditions.isNull;
+import static org.hisp.dhis.android.sdk.models.utils.Preconditions.isNull;
 
 public abstract class Job<T> extends AsyncTask<Void, Void, T> implements IJob<T> {
-    //private final Context mContext;
     private final int mJobId;
     private JobExecutor mJobExecutor;
 
     public Job(int jobId) {
-        //mContext = isNull(context, "Context must not be null");
         mJobId = isNull(jobId, "Job ID must not be null");
     }
 
@@ -83,10 +81,4 @@ public final void onUnbind() {
     public final int getJobId() {
         return mJobId;
     }
-
-    /*
-    protected Context getContext() {
-        return mContext;
-    }
-    */
 }
diff --git a/app/src/main/java/org/hisp/dhis/android/datacapture/api/job/base/JobExecutor.java b/app/src/main/java/org/hisp/dhis/android/datacapture/api/job/base/JobExecutor.java
@@ -35,7 +35,7 @@
 import java.util.Map;
 import java.util.Queue;
 
-import static org.hisp.dhis.android.datacapture.sdk.utils.Preconditions.isNull;
+import static org.hisp.dhis.android.sdk.models.utils.Preconditions.isNull;
 
 public final class JobExecutor {
     private static final String TAG = JobExecutor.class.getSimpleName();

diff --git a/app/src/main/java/org/hisp/dhis/android/datacapture/api/job/base/NetworkJob.java b/app/src/main/java/org/hisp/dhis/android/datacapture/api/job/base/NetworkJob.java
@@ -28,9 +28,9 @@
 
 package org.hisp.dhis.android.datacapture.api.job.base;
 
-import org.hisp.dhis.android.datacapture.api.models.ResponseHolder;
-import org.hisp.dhis.android.datacapture.sdk.network.APIException;
 import org.hisp.dhis.android.datacapture.utils.EventBus;
+import org.hisp.dhis.android.sdk.core.network.APIException;
+import org.hisp.dhis.android.sdk.core.persistence.models.common.meta.ResponseHolder;
 
 public abstract class NetworkJob<T> extends Job<ResponseHolder<T>> {
     public NetworkJob(int jobId) {

diff --git a/app/src/main/java/org/hisp/dhis/android/datacapture/api/models/ResponseHolder.java b/app/src/main/java/org/hisp/dhis/android/datacapture/api/models/ResponseHolder.java
diff --git a/app/src/main/java/org/hisp/dhis/android/datacapture/ui/activities/BaseActivity.java b/app/src/main/java/org/hisp/dhis/android/datacapture/ui/activities/BaseActivity.java
@@ -28,20 +28,20 @@
 
 package org.hisp.dhis.android.datacapture.ui.activities;
 
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
-import static android.widget.Toast.LENGTH_SHORT;
-import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
-import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
 
 import org.hisp.dhis.android.datacapture.DataCaptureApplication;
 import org.hisp.dhis.android.datacapture.DhisService;
 import org.hisp.dhis.android.datacapture.R;
-import org.hisp.dhis.android.datacapture.sdk.DhisManager;
-import org.hisp.dhis.android.datacapture.sdk.network.APIException;
 import org.hisp.dhis.android.datacapture.utils.EventBus;
+import org.hisp.dhis.android.sdk.core.network.APIException;
+
+import static android.widget.Toast.LENGTH_SHORT;
+import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
+import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
 
-public class BaseActivity extends ActionBarActivity {
+public class BaseActivity extends AppCompatActivity {
 
     @Override
     protected void onResume() {
@@ -56,11 +56,7 @@ protected void onPause() {
     }
 
     protected DhisService getDhisService() {
-        return ((DataCaptureApplication) getApplication()).getDhisService();
-    }
-
-    protected DhisManager getDhisManager() {
-        return ((DataCaptureApplication) getApplication()).getDhisManager();
+        return ((DataCaptureApplication) getApplication()).getService();
     }
 
     protected void showMessage(CharSequence message) {
@@ -74,18 +70,18 @@ protected void showMessage(int id) {
     }
 
     protected void showApiExceptionMessage(APIException apiException) {
-        if (apiException.isUnknownError()) {
-            throw new IllegalArgumentException("Unexpected error");
-        }
-
-        if (apiException.isNetworkError()) {
-            showMessage(R.string.no_network_connection);
-            return;
-        }
-
-        if (apiException.isConversionError()) {
-            showMessage(R.string.bad_response);
-            return;
+        switch (apiException.getKind()) {
+            case UNEXPECTED: {
+                throw new IllegalArgumentException("Unexpected error");
+            }
+            case NETWORK: {
+                showMessage(R.string.no_network_connection);
+                return;
+            }
+            case CONVERSION: {
+                showMessage(R.string.bad_response);
+                return;
+            }
         }
 
         int code = apiException.getResponse().getStatus();

diff --git a/app/src/main/java/org/hisp/dhis/android/datacapture/ui/activities/ConfirmUserActivity.java b/app/src/main/java/org/hisp/dhis/android/datacapture/ui/activities/ConfirmUserActivity.java
@@ -40,9 +40,9 @@
 import com.squareup.otto.Subscribe;
 
 import org.hisp.dhis.android.datacapture.R;
-import org.hisp.dhis.android.datacapture.sdk.persistence.models.UserAccount;
-import org.hisp.dhis.android.datacapture.sdk.network.APIException;
-import org.hisp.dhis.android.datacapture.sdk.network.models.Credentials;
+import org.hisp.dhis.android.sdk.core.network.APIException;
+import org.hisp.dhis.android.sdk.core.persistence.models.common.meta.Credentials;
+import org.hisp.dhis.android.sdk.models.user.UserAccount;
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
@@ -55,13 +55,26 @@
 public class ConfirmUserActivity extends BaseActivity {
     private static final String IS_LOADING = "state:isLoading";
 
-    @InjectView(R.id.toolbar) Toolbar mToolbar;
-    @InjectView(R.id.progress_bar_circular_navy) CircularProgressBar mProgressBar;
-    @InjectView(R.id.re_log_in_views_container) View mViewsContainer;
-    @InjectView(R.id.username) EditText mUsername;
-    @InjectView(R.id.password) EditText mPassword;
-    @InjectView(R.id.re_log_in_button) Button mReLogIn;
-    @InjectView(R.id.delete_and_log_out_button) Button mLogOut;
+    @InjectView(R.id.toolbar)
+    Toolbar mToolbar;
+
+    @InjectView(R.id.progress_bar_circular_navy)
+    CircularProgressBar mProgressBar;
+
+    @InjectView(R.id.re_log_in_views_container)
+    View mViewsContainer;
+
+    @InjectView(R.id.username)
+    EditText mUsername;
+
+    @InjectView(R.id.password)
+    EditText mPassword;
+
+    @InjectView(R.id.re_log_in_button)
+    Button mReLogIn;
+
+    @InjectView(R.id.delete_and_log_out_button)
+    Button mLogOut;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

diff --git a/app/src/main/java/org/hisp/dhis/android/datacapture/ui/activities/LauncherActivity.java b/app/src/main/java/org/hisp/dhis/android/datacapture/ui/activities/LauncherActivity.java
@@ -33,6 +33,7 @@
 import android.support.v7.widget.Toolbar;
 
 import org.hisp.dhis.android.datacapture.R;
+import org.hisp.dhis.android.sdk.core.api.Dhis2;
 
 public class LauncherActivity extends BaseActivity {
 
@@ -46,9 +47,9 @@ protected void onCreate(Bundle savedInstanceState) {
         setTitle(R.string.app_name);
 
         Intent intent;
-        if (getDhisManager().isUserLoggedIn()) {
+        if (Dhis2.isUserLoggedIn()) {
             intent = new Intent(this, MenuActivity.class);
-        } else if (getDhisManager().isUserInvalidated()) {
+        } else if (Dhis2.isUserInvalidated()) {
             intent = new Intent(this, ConfirmUserActivity.class);
         } else {
             intent = new Intent(this, LoginActivity.class);

diff --git a/app/src/main/java/org/hisp/dhis/android/datacapture/ui/activities/LoginActivity.java b/app/src/main/java/org/hisp/dhis/android/datacapture/ui/activities/LoginActivity.java
@@ -40,9 +40,9 @@
 import com.squareup.otto.Subscribe;
 
 import org.hisp.dhis.android.datacapture.R;
-import org.hisp.dhis.android.datacapture.sdk.network.APIException;
-import org.hisp.dhis.android.datacapture.sdk.network.models.Credentials;
-import org.hisp.dhis.android.datacapture.sdk.persistence.models.UserAccount;
+import org.hisp.dhis.android.sdk.core.network.APIException;
+import org.hisp.dhis.android.sdk.core.persistence.models.common.meta.Credentials;
+import org.hisp.dhis.android.sdk.models.user.UserAccount;
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;