#165 SyncOnWifiOnly causes OfflineException on opening about activity

3 files changed, 23 insertions, 7 deletions

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 16b1c07ac..88a4f18d8 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
@@ -1,13 +1,19 @@
 package it.niedermann.nextcloud.deck.ui.about;
 
 import android.content.res.Resources;
+import android.graphics.Typeface;
 import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
 import java.util.Objects;
@@ -17,6 +23,7 @@ import butterknife.ButterKnife;
 import it.niedermann.nextcloud.deck.BuildConfig;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.api.IResponseCallback;
+import it.niedermann.nextcloud.deck.exceptions.OfflineException;
 import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
 import it.niedermann.nextcloud.deck.util.LinkUtil;
@@ -38,12 +45,19 @@ public class AboutFragmentCreditsTab extends Fragment {
         ButterKnife.bind(this, v);
         LinkUtil.setHtml(aboutVersion, getString(R.string.about_version, getVersionStrongTag(getResources(), BuildConfig.VERSION_NAME)));
         SyncManager syncManager = new SyncManager(Objects.requireNonNull(getActivity()));
-        syncManager.getServerVersion(new IResponseCallback<Capabilities>(null) {
-            @Override
-            public void onResponse(Capabilities response) {
-                Objects.requireNonNull(getActivity()).runOnUiThread(() -> LinkUtil.setHtml(aboutServerAppVersion, getVersionStrongTag(getResources(), response.getDeckVersion().toString())));
-            }
-        });
+        try {
+            syncManager.getServerVersion(new IResponseCallback<Capabilities>(null) {
+                @Override
+                public void onResponse(Capabilities response) {
+                    Objects.requireNonNull(getActivity()).runOnUiThread(() -> LinkUtil.setHtml(aboutServerAppVersion, getVersionStrongTag(getResources(), response.getDeckVersion().toString())));
+                }
+            });
+        } catch (OfflineException e) {
+            Spannable offlineText = new SpannableString(getString(R.string.you_are_currently_offline));
+            offlineText.setSpan(new StyleSpan(Typeface.ITALIC), 0, offlineText.length(), 0);
+            offlineText.setSpan(new ForegroundColorSpan(ContextCompat.getColor(Objects.requireNonNull(getContext()), R.color.fg_secondary)), 0, offlineText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            aboutServerAppVersion.setText(offlineText);
+        }
         LinkUtil.setHtml(aboutMaintainer, LinkUtil.concatenateResources(v.getResources(),
                 R.string.anchor_start, R.string.url_maintainer, R.string.anchor_middle, R.string.about_maintainer, R.string.anchor_end));
         LinkUtil.setHtml(aboutTranslators,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1194d519b..565744320 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -143,4 +143,5 @@
     <string name="no_activities">There are no activities on this card. You need to be connected to the internet to load and display activities.</string>
     <string name="rename_column">Rename column</string>
     <string name="share_board">Share board</string>
+    <string name="you_are_currently_offline">You are currently offline</string>
 </resources>
diff --git a/fastlane/metadata/android/en-US/changelogs/13.txt b/fastlane/metadata/android/en-US/changelogs/13.txt
index de6a54719..11d0dcdf6 100644
--- a/fastlane/metadata/android/en-US/changelogs/13.txt
+++ b/fastlane/metadata/android/en-US/changelogs/13.txt
@@ -1,2 +1,3 @@
 - Fix Double-clicking card opens EditActivity twice (#159)
-- Fix crash when hitting enter on a label or user search input
\ No newline at end of file
+- Fix crash when hitting enter on a label or user search input
+- SyncOnWifiOnly causes OfflineException on opening about activity (#165)
\ No newline at end of file