From 1a38155c01b57671b743c4ec58cc9c306cb9a93c Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Thu, 10 Oct 2019 21:50:37 +0200 Subject: [PATCH] Fix some SonarLint warnings in AddFeedActivity --- .../ManageFeedsFoldersActivity.java | 30 ++++--------------- .../app/fragments/EditFeedDialogFragment.java | 6 ++-- .../fragments/FeedOptionsDialogFragment.kt | 6 ++-- .../readrops/app/fragments/FeedsFragment.java | 4 +-- .../app/fragments/FoldersFragment.java | 4 +-- .../settings/AccountSettingsFragment.java | 2 +- 6 files changed, 17 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java b/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java index 409f876c..596e78a8 100644 --- a/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java +++ b/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java @@ -11,7 +11,6 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; import androidx.lifecycle.ViewModelProviders; -import androidx.viewpager.widget.ViewPager; import com.afollestad.materialdialogs.MaterialDialog; import com.readrops.app.R; @@ -30,10 +29,9 @@ import io.reactivex.schedulers.Schedulers; public class ManageFeedsFoldersActivity extends AppCompatActivity { - public static final String ACCOUNT = "ACCOUNT"; + public static final String ACCOUNT_KEY = "ACCOUNT_KEY"; private ActivityManageFeedsFoldersBinding binding; - private FeedsFoldersPageAdapter pageAdapter; private ManageFeedsFoldersViewModel viewModel; private Account account; @@ -46,32 +44,15 @@ public class ManageFeedsFoldersActivity extends AppCompatActivity { setSupportActionBar(binding.manageFeedsFoldersToolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - account = getIntent().getParcelableExtra(ACCOUNT); + account = getIntent().getParcelableExtra(ACCOUNT_KEY); - pageAdapter = new FeedsFoldersPageAdapter(getSupportFragmentManager()); + FeedsFoldersPageAdapter pageAdapter = new FeedsFoldersPageAdapter(getSupportFragmentManager()); binding.manageFeedsFoldersViewpager.setAdapter(pageAdapter); binding.manageFeedsFoldersTablayout.setupWithViewPager(binding.manageFeedsFoldersViewpager); viewModel = ViewModelProviders.of(this).get(ManageFeedsFoldersViewModel.class); viewModel.setAccount(account); - - binding.manageFeedsFoldersViewpager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - - } - - @Override - public void onPageSelected(int position) { - binding.manageFeedsFoldersTablayout.getTabAt(position).select(); - } - - @Override - public void onPageScrollStateChanged(int state) { - - } - }); } @@ -92,8 +73,9 @@ public class ManageFeedsFoldersActivity extends AppCompatActivity { case R.id.add_folder: addFolder(); return true; + default: + return super.onOptionsItemSelected(item); } - return super.onOptionsItemSelected(item); } @Override @@ -132,7 +114,7 @@ public class ManageFeedsFoldersActivity extends AppCompatActivity { public class FeedsFoldersPageAdapter extends FragmentPagerAdapter { private FeedsFoldersPageAdapter(FragmentManager fragmentManager) { - super(fragmentManager); + super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT); } @Override diff --git a/app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java b/app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java index bb8dafdd..f2a3d45b 100644 --- a/app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/EditFeedDialogFragment.java @@ -29,7 +29,7 @@ import java.util.TreeMap; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; -import static com.readrops.app.activities.ManageFeedsFoldersActivity.ACCOUNT; +import static com.readrops.app.activities.ManageFeedsFoldersActivity.ACCOUNT_KEY; public class EditFeedDialogFragment extends DialogFragment implements AdapterView.OnItemSelectedListener { @@ -49,7 +49,7 @@ public class EditFeedDialogFragment extends DialogFragment implements AdapterVie public static EditFeedDialogFragment newInstance(FeedWithFolder feedWithFolder, Account account) { Bundle args = new Bundle(); args.putParcelable("feedWithFolder", feedWithFolder); - args.putParcelable(ACCOUNT, account); + args.putParcelable(ACCOUNT_KEY, account); EditFeedDialogFragment fragment = new EditFeedDialogFragment(); fragment.setArguments(args); @@ -63,7 +63,7 @@ public class EditFeedDialogFragment extends DialogFragment implements AdapterVie viewModel = ViewModelProviders.of(getActivity()).get(ManageFeedsFoldersViewModel.class); feedWithFolder = getArguments().getParcelable("feedWithFolder"); - account = getArguments().getParcelable(ManageFeedsFoldersActivity.ACCOUNT); + account = getArguments().getParcelable(ManageFeedsFoldersActivity.ACCOUNT_KEY); viewModel.setAccount(account); diff --git a/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt b/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt index 5b245b39..08d6e218 100644 --- a/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt +++ b/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt @@ -9,7 +9,7 @@ import android.view.ViewGroup import androidx.databinding.DataBindingUtil import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.readrops.app.R -import com.readrops.app.activities.ManageFeedsFoldersActivity.ACCOUNT +import com.readrops.app.activities.ManageFeedsFoldersActivity.ACCOUNT_KEY import com.readrops.app.database.entities.account.Account import com.readrops.app.database.pojo.FeedWithFolder import com.readrops.app.databinding.FeedOptionsLayoutBinding @@ -26,7 +26,7 @@ class FeedOptionsDialogFragment : BottomSheetDialogFragment() { fun newInstance(feedWithFolder: FeedWithFolder, account: Account): FeedOptionsDialogFragment { val bundle = Bundle() bundle.putParcelable(FEED_KEY, feedWithFolder) - bundle.putParcelable(ACCOUNT, account) + bundle.putParcelable(ACCOUNT_KEY, account) val feedsOptionsDialogFragment = FeedOptionsDialogFragment() feedsOptionsDialogFragment.arguments = bundle @@ -39,7 +39,7 @@ class FeedOptionsDialogFragment : BottomSheetDialogFragment() { super.onCreate(savedInstanceState) feedWithFolder = arguments?.getParcelable(FEED_KEY)!! - account = arguments?.getParcelable(ACCOUNT)!! + account = arguments?.getParcelable(ACCOUNT_KEY)!! } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { diff --git a/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java b/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java index 158aa0f3..8570db0c 100644 --- a/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java @@ -29,7 +29,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.observers.DisposableCompletableObserver; import io.reactivex.schedulers.Schedulers; -import static com.readrops.app.activities.ManageFeedsFoldersActivity.ACCOUNT; +import static com.readrops.app.activities.ManageFeedsFoldersActivity.ACCOUNT_KEY; public class FeedsFragment extends Fragment { @@ -58,7 +58,7 @@ public class FeedsFragment extends Fragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - account = getArguments().getParcelable(ACCOUNT); + account = getArguments().getParcelable(ACCOUNT_KEY); if (account.getLogin() == null) account.setLogin(SharedPreferencesManager.readString(getContext(), account.getLoginKey())); diff --git a/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java b/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java index 206bf9b0..0bda23b8 100644 --- a/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java @@ -46,7 +46,7 @@ public class FoldersFragment extends Fragment { FoldersFragment fragment = new FoldersFragment(); Bundle args = new Bundle(); - args.putParcelable(ManageFeedsFoldersActivity.ACCOUNT, account); + args.putParcelable(ManageFeedsFoldersActivity.ACCOUNT_KEY, account); fragment.setArguments(args); return fragment; @@ -56,7 +56,7 @@ public class FoldersFragment extends Fragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - account = getArguments().getParcelable(ManageFeedsFoldersActivity.ACCOUNT); + account = getArguments().getParcelable(ManageFeedsFoldersActivity.ACCOUNT_KEY); if (account.getLogin() == null) account.setLogin(SharedPreferencesManager.readString(getContext(), account.getLoginKey())); diff --git a/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java b/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java index 7f54a2f8..74b25405 100644 --- a/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java @@ -27,7 +27,7 @@ import io.reactivex.schedulers.Schedulers; */ public class AccountSettingsFragment extends PreferenceFragmentCompat { - public static final String ACCOUNT = "ACCOUNT"; + public static final String ACCOUNT = "ACCOUNT_KEY"; private Account account; private AccountViewModel viewModel;