You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by sa...@apache.org on 2018/06/11 18:24:56 UTC

[3/6] incubator-taverna-mobile git commit: fix checkstyle and pmd issues

fix checkstyle and pmd issues


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/72b8d2e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/72b8d2e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/72b8d2e6

Branch: refs/heads/master
Commit: 72b8d2e6680dbe483782246c92ece034b7fe1efe
Parents: c421e70
Author: Sagar <ku...@gmail.com>
Authored: Mon Jun 11 23:29:29 2018 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Jun 11 23:29:29 2018 +0530

----------------------------------------------------------------------
 .../apache/taverna/mobile/TavernaApplication.java | 10 +++++-----
 .../mobile/data/local/PreferencesHelper.java      |  2 --
 .../taverna/mobile/data/model/Announcement.java   |  5 -----
 .../injection/component/ApplicationComponent.java |  7 +++----
 .../injection/module/ApplicationModule.java       | 10 ++--------
 .../taverna/mobile/ui/DashboardActivity.java      | 13 ++++++-------
 .../taverna/mobile/ui/FlashScreenActivity.java    | 11 +++++------
 .../mobile/ui/adapter/AnnouncementAdapter.java    |  2 --
 .../ui/adapter/FavouriteWorkflowsAdapter.java     | 14 ++++++--------
 .../mobile/ui/adapter/WorkflowAdapter.java        |  2 --
 .../ui/anouncements/AnnouncementFragment.java     |  2 --
 .../FavouriteWorkflowsActivity.java               | 11 +++++------
 .../FavouriteWorkflowDetailActivity.java          |  9 ++++-----
 .../mobile/ui/imagezoom/ImageZoomActivity.java    |  7 +++----
 .../taverna/mobile/ui/login/LoginActivity.java    |  5 ++---
 .../taverna/mobile/ui/login/LoginFragment.java    |  1 -
 .../mobile/ui/myworkflows/MyWorkflowActivity.java | 11 +++++------
 .../mobile/ui/myworkflows/MyWorkflowFragment.java |  1 -
 .../ui/playerlogin/PlayerLoginFragment.java       |  1 -
 .../mobile/ui/tutorial/TutorialActivity.java      | 15 +++++++--------
 .../ui/userprofile/UserProfileActivity.java       |  8 ++++----
 .../ui/userprofile/UserProfileFragment.java       | 17 ++++++++---------
 .../mobile/ui/workflow/WorkflowFragment.java      |  1 -
 .../ui/workflowdetail/WorkflowDetailActivity.java |  9 ++++-----
 .../ui/workflowrun/WorkflowRunActivity.java       | 18 ++++++++----------
 25 files changed, 77 insertions(+), 115 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
index 41bd726..a0bd696 100644
--- a/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
+++ b/app/src/main/java/org/apache/taverna/mobile/TavernaApplication.java
@@ -35,12 +35,16 @@ public class TavernaApplication extends Application {
 
     ApplicationComponent mApplicationComponent;
 
+    public static TavernaApplication get(Context context) {
+        return (TavernaApplication) context.getApplicationContext();
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
 
         FlowManager.init(new FlowConfig.Builder(this).build());
-        if(BuildConfig.DEBUG) {
+        if (BuildConfig.DEBUG) {
             Stetho.initializeWithDefaults(this);
         }
 
@@ -51,10 +55,6 @@ public class TavernaApplication extends Application {
 
     }
 
-    public static TavernaApplication get(Context context) {
-        return (TavernaApplication) context.getApplicationContext();
-    }
-
     public ApplicationComponent getComponent() {
         if (mApplicationComponent == null) {
             mApplicationComponent = DaggerApplicationComponent.builder()

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
index 80e2f00..3fafe7c 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/local/PreferencesHelper.java
@@ -20,7 +20,6 @@ package org.apache.taverna.mobile.data.local;
 
 import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.data.model.User;
-import org.apache.taverna.mobile.injection.ActivityContext;
 import org.apache.taverna.mobile.injection.ApplicationContext;
 
 import android.content.Context;
@@ -32,7 +31,6 @@ import java.util.concurrent.Callable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import dagger.Provides;
 import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/data/model/Announcement.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/Announcement.java b/app/src/main/java/org/apache/taverna/mobile/data/model/Announcement.java
index ebea4eb..be91c6c 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/model/Announcement.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/Announcement.java
@@ -24,11 +24,6 @@ import org.simpleframework.xml.Text;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import dagger.Provides;
-
 public class Announcement implements Parcelable {
 
     @Attribute(name = "resource", required = false)

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/injection/component/ApplicationComponent.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/injection/component/ApplicationComponent.java b/app/src/main/java/org/apache/taverna/mobile/injection/component/ApplicationComponent.java
index 517a3a5..f084431 100644
--- a/app/src/main/java/org/apache/taverna/mobile/injection/component/ApplicationComponent.java
+++ b/app/src/main/java/org/apache/taverna/mobile/injection/component/ApplicationComponent.java
@@ -1,14 +1,13 @@
 package org.apache.taverna.mobile.injection.component;
 
-import android.app.Application;
-import android.content.Context;
-
 import org.apache.taverna.mobile.data.DataManager;
 import org.apache.taverna.mobile.data.local.PreferencesHelper;
 import org.apache.taverna.mobile.injection.ApplicationContext;
-import org.apache.taverna.mobile.injection.module.ActivityModule;
 import org.apache.taverna.mobile.injection.module.ApplicationModule;
 
+import android.app.Application;
+import android.content.Context;
+
 import javax.inject.Singleton;
 
 import dagger.Component;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/injection/module/ApplicationModule.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/injection/module/ApplicationModule.java b/app/src/main/java/org/apache/taverna/mobile/injection/module/ApplicationModule.java
index f6c04c6..7af14f9 100644
--- a/app/src/main/java/org/apache/taverna/mobile/injection/module/ApplicationModule.java
+++ b/app/src/main/java/org/apache/taverna/mobile/injection/module/ApplicationModule.java
@@ -1,15 +1,9 @@
 package org.apache.taverna.mobile.injection.module;
 
-import android.app.Application;
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import com.raizlabs.android.dbflow.annotation.Database;
-
-import org.apache.taverna.mobile.data.remote.TavernaService;
 import org.apache.taverna.mobile.injection.ApplicationContext;
 
-import javax.inject.Singleton;
+import android.app.Application;
+import android.content.Context;
 
 import dagger.Module;
 import dagger.Provides;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
index 4410d5f..2019625 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
@@ -18,9 +18,14 @@
  */
 package org.apache.taverna.mobile.ui;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.drawable.GlideDrawable;
+import com.bumptech.glide.request.animation.GlideAnimation;
+import com.bumptech.glide.request.target.SimpleTarget;
+
 import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.local.PreferencesHelper;
 import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment;
 import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsFragment;
 import org.apache.taverna.mobile.ui.login.LoginActivity;
@@ -49,12 +54,6 @@ import android.webkit.WebView;
 import android.widget.TableLayout;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.load.resource.drawable.GlideDrawable;
-import com.bumptech.glide.request.animation.GlideAnimation;
-import com.bumptech.glide.request.target.SimpleTarget;
-
 import javax.inject.Inject;
 
 import butterknife.BindView;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java
index 2a1dd61..d293223 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java
@@ -18,17 +18,16 @@
  */
 package org.apache.taverna.mobile.ui;
 
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-
 import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.local.PreferencesHelper;
 import org.apache.taverna.mobile.ui.login.LoginActivity;
 import org.apache.taverna.mobile.ui.tutorial.TutorialActivity;
 
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
 import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java
index a3cc635..679aaf2 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java
@@ -30,8 +30,6 @@ import android.widget.TextView;
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
index 44ba09b..b31eecc 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/FavouriteWorkflowsAdapter.java
@@ -25,6 +25,12 @@
 
 package org.apache.taverna.mobile.ui.adapter;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.model.Workflow;
+
 import android.content.Context;
 import android.net.Uri;
 import android.support.v7.widget.RecyclerView;
@@ -34,16 +40,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.data.model.Workflow;
-
 import java.util.List;
 
-import javax.inject.Inject;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
index ab011f6..342dee4 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/WorkflowAdapter.java
@@ -43,8 +43,6 @@ import android.widget.TextView;
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
index ac1df9b..0037af0 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
@@ -22,8 +22,6 @@ import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.data.DataManager;
 import org.apache.taverna.mobile.data.model.Announcements;
 import org.apache.taverna.mobile.data.model.DetailAnnouncement;
-import org.apache.taverna.mobile.injection.component.ActivityComponent;
-import org.apache.taverna.mobile.injection.module.ActivityModule;
 import org.apache.taverna.mobile.ui.adapter.AnnouncementAdapter;
 import org.apache.taverna.mobile.ui.adapter.EndlessRecyclerOnScrollListener;
 import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsActivity.java
index 898322c..d47cc8c 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflow/FavouriteWorkflowsActivity.java
@@ -1,17 +1,16 @@
 package org.apache.taverna.mobile.ui.favouriteworkflow;
 
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.ui.base.BaseActivity;
+import org.apache.taverna.mobile.utils.ActivityUtils;
+
+import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.ui.base.BaseActivity;
-import org.apache.taverna.mobile.utils.ActivityUtils;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
index 5e102d9..ed24d18 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailActivity.java
@@ -19,16 +19,15 @@
 package org.apache.taverna.mobile.ui.favouriteworkflowdetail;
 
 
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.ui.base.BaseActivity;
+import org.apache.taverna.mobile.utils.Constants;
+
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.ui.base.BaseActivity;
-import org.apache.taverna.mobile.utils.Constants;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java
index 3782973..1bb25db 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomActivity.java
@@ -19,14 +19,13 @@
 package org.apache.taverna.mobile.ui.imagezoom;
 
 
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-
 import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.ui.base.BaseActivity;
 import org.apache.taverna.mobile.utils.ActivityUtils;
 
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
 import butterknife.ButterKnife;
 
 public class ImageZoomActivity extends BaseActivity {

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java
index 882095c..d928bef 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginActivity.java
@@ -18,13 +18,12 @@
  */
 package org.apache.taverna.mobile.ui.login;
 
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-
 import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.ui.base.BaseActivity;
 import org.apache.taverna.mobile.utils.ActivityUtils;
 
+import android.os.Bundle;
+
 
 public class LoginActivity extends BaseActivity {
     private static final String TAG = "LoginActivity";

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java
index 930cc2a..3f544c5 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java
@@ -21,7 +21,6 @@ package org.apache.taverna.mobile.ui.login;
 
 import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.local.PreferencesHelper;
 import org.apache.taverna.mobile.ui.DashboardActivity;
 import org.apache.taverna.mobile.ui.base.BaseActivity;
 import org.apache.taverna.mobile.utils.ConnectionInfo;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowActivity.java
index 440af4f..a059af4 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowActivity.java
@@ -1,17 +1,16 @@
 package org.apache.taverna.mobile.ui.myworkflows;
 
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.ui.base.BaseActivity;
+import org.apache.taverna.mobile.utils.ActivityUtils;
+
+import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.ui.base.BaseActivity;
-import org.apache.taverna.mobile.utils.ActivityUtils;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
index 3f890dc..320fb65 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/myworkflows/MyWorkflowFragment.java
@@ -20,7 +20,6 @@ package org.apache.taverna.mobile.ui.myworkflows;
 
 import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.local.PreferencesHelper;
 import org.apache.taverna.mobile.data.model.Workflow;
 import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner;
 import org.apache.taverna.mobile.ui.adapter.WorkflowAdapter;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
index 3195f93..9ea3eda 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/playerlogin/PlayerLoginFragment.java
@@ -21,7 +21,6 @@ package org.apache.taverna.mobile.ui.playerlogin;
 
 import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.local.PreferencesHelper;
 import org.apache.taverna.mobile.ui.base.BaseActivity;
 import org.apache.taverna.mobile.utils.ConnectionInfo;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/tutorial/TutorialActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/tutorial/TutorialActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/tutorial/TutorialActivity.java
index 1efaa9c..9b7cc66 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/tutorial/TutorialActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/tutorial/TutorialActivity.java
@@ -18,24 +18,23 @@
  */
 package org.apache.taverna.mobile.ui.tutorial;
 
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.data.local.PreferencesHelper;
+import org.apache.taverna.mobile.data.model.TutorialSliderEnum;
+import org.apache.taverna.mobile.ui.adapter.TutorialSliderAdapter;
+import org.apache.taverna.mobile.ui.base.BaseActivity;
+import org.apache.taverna.mobile.ui.login.LoginActivity;
+
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.data.local.PreferencesHelper;
-import org.apache.taverna.mobile.data.model.TutorialSliderEnum;
-import org.apache.taverna.mobile.ui.adapter.TutorialSliderAdapter;
-import org.apache.taverna.mobile.ui.base.BaseActivity;
-import org.apache.taverna.mobile.ui.login.LoginActivity;
-
 import javax.inject.Inject;
 
 import butterknife.BindView;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileActivity.java
index 437fd47..409ccd3 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileActivity.java
@@ -18,16 +18,16 @@
  */
 package org.apache.taverna.mobile.ui.userprofile;
 
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.ui.base.BaseActivity;
+import org.apache.taverna.mobile.utils.ActivityUtils;
+
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.ui.base.BaseActivity;
-import org.apache.taverna.mobile.utils.ActivityUtils;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileFragment.java
index de266f2..c33ac94 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/userprofile/UserProfileFragment.java
@@ -1,13 +1,5 @@
 package org.apache.taverna.mobile.ui.userprofile;
 
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.drawable.GlideDrawable;
@@ -16,11 +8,18 @@ import com.bumptech.glide.request.target.SimpleTarget;
 
 import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.local.PreferencesHelper;
 import org.apache.taverna.mobile.ui.base.BaseActivity;
 import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsActivity;
 import org.apache.taverna.mobile.ui.myworkflows.MyWorkflowActivity;
 
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowFragment.java
index b87b947..750a716 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflow/WorkflowFragment.java
@@ -19,7 +19,6 @@
 package org.apache.taverna.mobile.ui.workflow;
 
 import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.data.DataManager;
 import org.apache.taverna.mobile.data.model.Workflow;
 import org.apache.taverna.mobile.data.model.Workflows;
 import org.apache.taverna.mobile.ui.adapter.EndlessRecyclerOnScrollListener;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java
index 0ab57dc..221297e 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java
@@ -19,16 +19,15 @@
 package org.apache.taverna.mobile.ui.workflowdetail;
 
 
+import org.apache.taverna.mobile.R;
+import org.apache.taverna.mobile.ui.base.BaseActivity;
+import org.apache.taverna.mobile.utils.Constants;
+
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 
-import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.ui.base.BaseActivity;
-import org.apache.taverna.mobile.utils.Constants;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/72b8d2e6/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
index c06c9e6..620c5de 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java
@@ -18,20 +18,10 @@
  */
 package org.apache.taverna.mobile.ui.workflowrun;
 
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.PagerAdapter;
-import android.widget.Toast;
-
 import com.anton46.stepsview.StepsView;
 
 import org.apache.taverna.mobile.R;
 import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.local.PreferencesHelper;
 import org.apache.taverna.mobile.ui.DownloadingFragment;
 import org.apache.taverna.mobile.ui.base.BaseActivity;
 import org.apache.taverna.mobile.ui.playerlogin.PlayerLoginFragment;
@@ -39,6 +29,14 @@ import org.apache.taverna.mobile.utils.Constants;
 import org.apache.taverna.mobile.utils.NonSwipeableViewPager;
 import org.apache.taverna.mobile.utils.WebViewGenerator;
 
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.view.PagerAdapter;
+import android.widget.Toast;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;