Upgrade to SSO 0.5.1 and enable action buttons for exceptions

2 files changed, 12 insertions, 10 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
index cdc9e11d8..7d2d0c983 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
@@ -32,6 +32,7 @@ import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.ui.exception.tips.TipsAdapter;
 import it.niedermann.nextcloud.deck.util.ExceptionUtil;
 
+import static android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
 import static it.niedermann.nextcloud.deck.util.ClipboardUtil.copyToClipboard;
 
 public class ExceptionDialogFragment extends AppCompatDialogFragment {
@@ -76,7 +77,7 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment {
         if (throwable instanceof TokenMismatchException) {
             adapter.add(R.string.error_dialog_tip_token_mismatch_retry);
             adapter.add(R.string.error_dialog_tip_token_mismatch_clear_storage);
-            Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+            Intent intent = new Intent(ACTION_APPLICATION_DETAILS_SETTINGS)
                     .setData(Uri.parse("package:" + BuildConfig.APPLICATION_ID))
                     .putExtra(INTENT_EXTRA_BUTTON_TEXT, R.string.error_action_open_deck_info);
             adapter.add(R.string.error_dialog_tip_clear_storage, intent);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java
index bb3f8525b..622a32e3b 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java
@@ -9,6 +9,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import it.niedermann.nextcloud.deck.databinding.ItemTipBinding;
 
+import static it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment.INTENT_EXTRA_BUTTON_TEXT;
+
 public class TipsViewHolder extends RecyclerView.ViewHolder {
     private final ItemTipBinding binding;
 
@@ -20,14 +22,13 @@ public class TipsViewHolder extends RecyclerView.ViewHolder {
 
     public void bind(TipsModel tip, Consumer<Intent> actionButtonClickedListener) {
         binding.tip.setText(tip.getText());
-        // TODO Requires https://github.com/nextcloud/Android-SingleSignOn/pull/203 to be merged, released and used, otherwise will crash
-//        final Intent actionIntent = tip.getActionIntent();
-//        if (actionIntent != null && actionIntent.hasExtra(INTENT_EXTRA_BUTTON_TEXT)) {
-//            binding.actionButton.setVisibility(View.VISIBLE);
-//            binding.actionButton.setText(actionIntent.getIntExtra(INTENT_EXTRA_BUTTON_TEXT, 0));
-//            binding.actionButton.setOnClickListener((v) -> actionButtonClickedListener.accept(actionIntent));
-//        } else {
-        binding.actionButton.setVisibility(View.GONE);
-//        }
+        final Intent actionIntent = tip.getActionIntent();
+        if (actionIntent != null && actionIntent.hasExtra(INTENT_EXTRA_BUTTON_TEXT)) {
+            binding.actionButton.setVisibility(View.VISIBLE);
+            binding.actionButton.setText(actionIntent.getIntExtra(INTENT_EXTRA_BUTTON_TEXT, 0));
+            binding.actionButton.setOnClickListener((v) -> actionButtonClickedListener.accept(actionIntent));
+        } else {
+            binding.actionButton.setVisibility(View.GONE);
+        }
     }
 }
\ No newline at end of file