Introduce createIntent()-methods for activities with arguments for a more convenient use

2 files changed, 15 insertions, 6 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java
index 55eda4eb9..11de1efeb 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.about;
 
+import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
@@ -85,4 +87,10 @@ public class AboutActivity extends BrandedActivity {
         applyBrandToPrimaryToolbar(mainColor, textColor, binding.toolbar);
         applyBrandToPrimaryTabLayout(mainColor, textColor, binding.tabLayout);
     }
+
+    @NonNull
+    public static Intent createIntent(@NonNull Context context, @NonNull Account account) {
+        return new Intent(context, AboutActivity.class)
+                .putExtra(BUNDLE_KEY_ACCOUNT, account);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java
index 122ea42f2..dcb51df10 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java
@@ -37,8 +37,9 @@ public class AboutFragmentCreditsTab extends Fragment {
         // VERSIONS
 
         binding.aboutVersion.setText(getString(R.string.about_version, strong(BuildConfig.VERSION_NAME)));
-        if (getArguments() != null && getArguments().containsKey(BUNDLE_KEY_ACCOUNT)) {
-            Account account = (Account) requireArguments().getSerializable(BUNDLE_KEY_ACCOUNT);
+        final Bundle args = getArguments();
+        if (args != null && args.containsKey(BUNDLE_KEY_ACCOUNT)) {
+            final Account account = (Account) requireArguments().getSerializable(BUNDLE_KEY_ACCOUNT);
             requireActivity().runOnUiThread(() -> binding.aboutServerAppVersion.setText(strong(account == null ? getString(R.string.simple_error) : account.getServerDeckVersion())));
         } else {
             binding.aboutServerAppVersionContainer.setVisibility(View.GONE);
@@ -62,16 +63,16 @@ public class AboutFragmentCreditsTab extends Fragment {
         return binding.getRoot();
     }
 
-    public static AboutFragmentCreditsTab newInstance() {
+    public static Fragment newInstance() {
         return new AboutFragmentCreditsTab();
     }
 
-    public static AboutFragmentCreditsTab newInstance(@Nullable Account account) {
+    public static Fragment newInstance(@Nullable Account account) {
         if (account == null) {
             return newInstance();
         }
-        AboutFragmentCreditsTab fragment = new AboutFragmentCreditsTab();
-        Bundle args = new Bundle();
+        final Fragment fragment = new AboutFragmentCreditsTab();
+        final Bundle args = new Bundle();
         args.putSerializable(BUNDLE_KEY_ACCOUNT, account);
         fragment.setArguments(args);
         return fragment;