Merge pull request #54 from snabble/missing_project_edgecase

Fix edge case when in single project apps the client has checked out

Author: ajungg

ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListFragment.kt

@@ -29,6 +29,6 @@ open class PaymentCredentialsListFragment : BaseFragment(
 
     override fun onActualViewCreated(view: View, savedInstanceState: Bundle?) {
         val v = view as PaymentCredentialsListView
-        type?.let { v.show(it, project) }
+        type?.let { v.show(it, project) } ?: v.setProject(project)
     }
 }

ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java

@@ -61,6 +61,7 @@ public PaymentCredentialsListView(Context context, AttributeSet attrs, int defSt
 
     private void inflateView() {
         inflate(getContext(), R.layout.snabble_view_payment_credentials_list, this);
+        if (isInEditMode()) return;
         paymentCredentialsStore = Snabble.getInstance().getPaymentCredentialsStore();
 
         recyclerView = findViewById(R.id.recycler_view);
@@ -85,6 +86,10 @@ public void click() {
                             p = Snabble.getInstance().getCheckedInProject().getValue();
                         }
 
+                        if (p == null) {
+                            throw new IllegalStateException("Cannot get current project. Did you forget to set the projectId to the PaymentCredentialsListFragment or PaymentCredentialsListView?");
+                        }
+
                         bundle.putString(SelectPaymentMethodFragment.ARG_PROJECT_ID, p.getId());
                         dialogFragment.setArguments(bundle);
                         dialogFragment.show(((FragmentActivity) activity).getSupportFragmentManager(), null);
@@ -104,6 +109,10 @@ public void click() {
         emptyState = findViewById(R.id.empty_state);
     }
 
+    public void setProject(Project project) {
+        this.project = project;
+    }
+
     public void show(List<PaymentCredentials.Type> types, Project project) {
         this.types = types;
         this.project = project;

ui/src/main/res/layout/snabble_fragment_payment_credentials_list.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<io.snabble.sdk.ui.payment.PaymentCredentialsListView xmlns:android="http://schemas.android.com/apk/res/android"
+<io.snabble.sdk.ui.payment.PaymentCredentialsListView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/user_payment_method_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</io.snabble.sdk.ui.payment.PaymentCredentialsListView>
+    android:layout_height="match_parent"/>