convert isConnectingToInternet method to static method
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/e48942ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e48942ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e48942ff Branch: refs/heads/master Commit: e48942fff6c703fca37157b74a856feb94af6bdd Parents: 8a1c5df Author: Sagar <[email protected]> Authored: Thu Aug 4 14:16:24 2016 +0530 Committer: Sagar <[email protected]> Committed: Thu Aug 4 14:16:24 2016 +0530 ---------------------------------------------------------------------- .../ui/anouncements/AnnouncementFragment.java | 27 ++++++++--------- .../FavouriteWorkflowDetailFragment.java | 6 ++-- .../mobile/ui/imagezoom/ImageZoomFragment.java | 6 ++-- .../taverna/mobile/ui/login/LoginFragment.java | 6 ++-- .../mobile/ui/workflow/WorkflowFragment.java | 32 ++++++++++---------- .../workflowdetail/WorkflowDetailFragment.java | 21 +++++++++++-- .../taverna/mobile/utils/ConnectionInfo.java | 20 +++--------- 7 files changed, 59 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e48942ff/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 5ebac60..1588fed 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 @@ -18,16 +18,6 @@ */ package org.apache.taverna.mobile.ui.anouncements; -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.ui.adapter.AnnouncementAdapter; -import org.apache.taverna.mobile.ui.adapter.EndlessRecyclerOnScrollListener; -import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner; -import org.apache.taverna.mobile.utils.ConnectionInfo; -import org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout; - import android.app.ProgressDialog; import android.os.Bundle; import android.support.design.widget.Snackbar; @@ -46,6 +36,16 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; +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.ui.adapter.AnnouncementAdapter; +import org.apache.taverna.mobile.ui.adapter.EndlessRecyclerOnScrollListener; +import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner; +import org.apache.taverna.mobile.utils.ConnectionInfo; +import org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout; + import butterknife.BindView; import butterknife.ButterKnife; @@ -80,7 +80,6 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL private DetailAnnouncement mAnnouncementDetail; - private ConnectionInfo mConnectionInfo; @Override public void onItemClick(View childView, int position) { @@ -102,7 +101,7 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL mAnnouncements = new Announcements(); dataManager = new DataManager(); mAnnouncementPresenter = new AnnouncementPresenter(dataManager); - mConnectionInfo = new ConnectionInfo(getContext()); + } @@ -125,7 +124,7 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL mSwipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override public void onRefresh() { - if (mConnectionInfo.isConnectingToInternet()) { + if (ConnectionInfo.isConnectingToInternet(getContext())) { if (mSwipeRefresh.isRefreshing()) { mPageNumber = 1; mAnnouncementPresenter.loadAllAnnouncement(mPageNumber); @@ -149,7 +148,7 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL @Override public void onLoadMore(int current_page) { - if (mConnectionInfo.isConnectingToInternet()) { + if (ConnectionInfo.isConnectingToInternet(getContext())) { mAnnouncements.getAnnouncement().add(null); mAnnouncementAdapter.notifyItemInserted(mAnnouncements.getAnnouncement().size ()); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e48942ff/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java index 723600f..be40d46 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java @@ -103,8 +103,6 @@ public class FavouriteWorkflowDetailFragment extends Fragment private FavouriteWorkflowDetailPresenter mWorkflowDetailPresenter; - private ConnectionInfo mConnectionInfo; - private String id; private String licenceId = null; @@ -134,7 +132,7 @@ public class FavouriteWorkflowDetailFragment extends Fragment dataManager = new DataManager(); mWorkflowDetailPresenter = new FavouriteWorkflowDetailPresenter(dataManager); - mConnectionInfo = new ConnectionInfo(getContext()); + } @Override @@ -154,7 +152,7 @@ public class FavouriteWorkflowDetailFragment extends Fragment public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - if (mConnectionInfo.isConnectingToInternet()) { + if (ConnectionInfo.isConnectingToInternet(getContext())) { mWorkflowDetailPresenter.loadWorkflowDetail(id); } else { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e48942ff/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java index 3cb8efc..4caf6db 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/imagezoom/ImageZoomFragment.java @@ -70,7 +70,7 @@ public class ImageZoomFragment extends Fragment implements ImageZoomMvpView { private ImageZoomPresenter mImageZoomPresenter; - private ConnectionInfo mConnectionInfo; + public static ImageZoomFragment newInstance(String jpgURI, String svgURI) { @@ -95,7 +95,7 @@ public class ImageZoomFragment extends Fragment implements ImageZoomMvpView { jpgURI = getArguments().getString(JPG_URI); mImageZoomPresenter = new ImageZoomPresenter(); - mConnectionInfo = new ConnectionInfo(getContext()); + } @Override @@ -114,7 +114,7 @@ public class ImageZoomFragment extends Fragment implements ImageZoomMvpView { public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - if (mConnectionInfo.isConnectingToInternet()) { + if (ConnectionInfo.isConnectingToInternet(getContext())) { mImageZoomPresenter.loadImage(svgURI, workflowImage); } else { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e48942ff/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 2fd1558..64d40b9 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 @@ -64,7 +64,7 @@ public class LoginFragment extends Fragment implements LoginMvpView, View.OnFocu private DataManager dataManager; private LoginPresenter mLoginPresenter; - private ConnectionInfo mConnectionInfo; + private ProgressDialog progressDialog; @@ -75,7 +75,7 @@ public class LoginFragment extends Fragment implements LoginMvpView, View.OnFocu dataManager = new DataManager(new PreferencesHelper(getContext())); mLoginPresenter = new LoginPresenter(dataManager); - mConnectionInfo = new ConnectionInfo(getContext()); + } @Override @@ -137,7 +137,7 @@ public class LoginFragment extends Fragment implements LoginMvpView, View.OnFocu @OnClick(R.id.bLogin) public void login(View v) { - if (mConnectionInfo.isConnectingToInternet()) { + if (ConnectionInfo.isConnectingToInternet(getContext())) { if (!mEditTextEmail.getText().toString().trim().isEmpty() && !mEditTextPassword .getText().toString().trim().isEmpty()) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e48942ff/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 f7e77d9..6d27d99 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,17 +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; -import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner; -import org.apache.taverna.mobile.ui.adapter.WorkflowAdapter; -import org.apache.taverna.mobile.ui.workflowdetail.WorkflowDetailActivity; -import org.apache.taverna.mobile.utils.ConnectionInfo; -import org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout; - import android.content.Intent; import android.os.Bundle; import android.support.design.widget.Snackbar; @@ -44,6 +33,17 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ProgressBar; +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; +import org.apache.taverna.mobile.ui.adapter.RecyclerItemClickListner; +import org.apache.taverna.mobile.ui.adapter.WorkflowAdapter; +import org.apache.taverna.mobile.ui.workflowdetail.WorkflowDetailActivity; +import org.apache.taverna.mobile.utils.ConnectionInfo; +import org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout; + import java.util.ArrayList; import java.util.List; @@ -69,7 +69,7 @@ public class WorkflowFragment extends Fragment implements WorkflowMvpView, private WorkflowAdapter mWorkflowAdapter; - private ConnectionInfo mConnectionInfo; + private int mPageNumber = 1; private List<Workflow> mWorkflowList; @@ -80,7 +80,7 @@ public class WorkflowFragment extends Fragment implements WorkflowMvpView, mWorkflowList = new ArrayList<>(); dataManager = new DataManager(); mWorkflowPresenter = new WorkflowPresenter(dataManager); - mConnectionInfo = new ConnectionInfo(getContext()); + } @Override @@ -109,14 +109,14 @@ public class WorkflowFragment extends Fragment implements WorkflowMvpView, @Override public void onLoadMore(int current_page) { - if (mConnectionInfo.isConnectingToInternet() + if (ConnectionInfo.isConnectingToInternet(getContext()) && mWorkflowList.size() % 10 == 0) { mWorkflowList.add(null); mWorkflowAdapter.notifyItemInserted(mWorkflowList.size()); ++mPageNumber; mWorkflowPresenter.loadAllWorkflow(mPageNumber); Log.d(LOG_TAG, "Loading more"); - } else if (!mConnectionInfo.isConnectingToInternet()) { + } else if (!ConnectionInfo.isConnectingToInternet(getContext())) { Log.d(LOG_TAG, "Internet not available. Not loading more posts."); showErrorSnackBar(); } @@ -128,7 +128,7 @@ public class WorkflowFragment extends Fragment implements WorkflowMvpView, mSwipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override public void onRefresh() { - if (mConnectionInfo.isConnectingToInternet()) { + if (ConnectionInfo.isConnectingToInternet(getContext())) { mPageNumber = 1; mWorkflowPresenter.loadAllWorkflow(mPageNumber); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e48942ff/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java index a26a625..be83a11 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java @@ -59,33 +59,48 @@ import butterknife.OnClick; public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMvpView { private static final String ID = "id"; + public final String LOG_TAG = getClass().getSimpleName(); + @BindView(R.id.ivWorkflowImage) ImageView workflowImage; + @BindView(R.id.tvTitle) TextView title; + @BindView(R.id.ivUploader) ImageView uploaderImage; + @BindView(R.id.tvUploaderName) TextView uploaderName; + @BindView(R.id.tvDate) TextView date; + @BindView(R.id.tvType) TextView type; + @BindView(R.id.tvDescription) WebView description; + @BindView(R.id.ivFav) ImageView ivFavourite; + @BindView(R.id.progressBar) ProgressBar mProgressBar; + @BindView(R.id.scrollView) ScrollView mScrollView; + @BindView(R.id.rootLayout) RelativeLayout rootLayout; + private AlertDialog alertDialog; + private DataManager dataManager; + private WorkflowDetailPresenter mWorkflowDetailPresenter; - private ConnectionInfo mConnectionInfo; + private String id; private String licenceId = null; @@ -112,7 +127,7 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv dataManager = new DataManager(); mWorkflowDetailPresenter = new WorkflowDetailPresenter(dataManager); - mConnectionInfo = new ConnectionInfo(getContext()); + } @Override @@ -132,7 +147,7 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - if (mConnectionInfo.isConnectingToInternet()) { + if (ConnectionInfo.isConnectingToInternet(getContext())) { mWorkflowDetailPresenter.loadWorkflowDetail(id); } else { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e48942ff/app/src/main/java/org/apache/taverna/mobile/utils/ConnectionInfo.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/ConnectionInfo.java b/app/src/main/java/org/apache/taverna/mobile/utils/ConnectionInfo.java index 3dba53d..e1b2847 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/ConnectionInfo.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/ConnectionInfo.java @@ -26,27 +26,15 @@ import android.util.Log; public class ConnectionInfo { private static final String TAG = "ConnectionInfo"; - private static Context context; - public ConnectionInfo(Context context) { + public static boolean isConnectingToInternet(Context context) { - Log.i(TAG, "Utils: "); - ConnectionInfo.context = context; - } - - - public boolean isConnectingToInternet() { + Log.i(TAG, "isConnectingToInternet: Checking Internet Status"); ConnectivityManager connectivity = (ConnectivityManager) context.getSystemService(Context .CONNECTIVITY_SERVICE); if (connectivity != null) { - NetworkInfo[] info = connectivity.getAllNetworkInfo(); - if (info != null) - for (int i = 0; i < info.length; i++) { - if (info[i].getState() == NetworkInfo.State.CONNECTED) { - return true; - } - } - + NetworkInfo info = connectivity.getActiveNetworkInfo(); + if (info != null) return true; } return false; }
