showing fallback text when no network interface is available and thus…

… no QR code can be shown
wolpi · Apr 13, 2024 · 9721224 · 9721224
1 parent 6f82144
commit 9721224
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/primitiveFTPd/res/layout/qr.xml b/primitiveFTPd/res/layout/qr.xml
@@ -26,6 +26,16 @@
             android:layout_marginStart="25dp"
             android:contentDescription="@null" />
 
+
+        <TextView
+            android:id="@+id/qrFallbackTextView"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/qrFallback"
+            android:focusable="false"
+            android:visibility="gone"
+            />
     </LinearLayout>
 
 </ScrollView>
diff --git a/primitiveFTPd/res/values/strings.xml b/primitiveFTPd/res/values/strings.xml
@@ -164,6 +164,7 @@
     <string name="iconKeysFingerprints">Keys Fingerprints</string>
     <string name="iconCleanSpace">Clean Space</string>
     <string name="iconAbout">About</string>
+    <string name="qrFallback">no network interfaces, no IP addresses, no QR code</string>
     <string-array name="prefWhichServerToStartNames">
         <item>FTP and SFTP</item>
         <item>FTP only</item>
@@ -184,4 +185,4 @@
         <item>1</item>
         <item>2</item>
     </string-array>
-</resources>
+</resources>
diff --git a/primitiveFTPd/src/org/primftpd/ui/QrFragment.java b/primitiveFTPd/src/org/primftpd/ui/QrFragment.java
@@ -11,6 +11,7 @@
 import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.TextView;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
@@ -32,6 +33,7 @@
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
 public class QrFragment extends Fragment implements RecreateLogger {
@@ -42,9 +44,10 @@ public class QrFragment extends Fragment implements RecreateLogger {
     private ImageView qrImage;
     private int width;
     private int height;
+    private TextView fallbackTextView;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState)
     {
         super.onCreateView(inflater, container, savedInstanceState);
@@ -53,6 +56,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         urlsParent = view.findViewById(R.id.qrUrlsParent);
         qrImage = view.findViewById(R.id.qrImage);
+        fallbackTextView = view.findViewById(R.id.qrFallbackTextView);
 
         width = (int) (getResources().getDisplayMetrics().widthPixels * 0.9);
         height = getResources().getDisplayMetrics().heightPixels / 2;
@@ -81,6 +85,12 @@ public void onResume() {
 
         List<String> urls = new ArrayList<>();
 
+        if (ipAddressTexts.isEmpty()) {
+            fallbackTextView.setVisibility(View.VISIBLE);
+        } else {
+            fallbackTextView.setVisibility(View.GONE);
+        }
+
         for (String ipAddressText : ipAddressTexts) {
             boolean ipv6 = ipAddressProvider.isIpv6(ipAddressText);
             if (!ipv6 && !showIpv4) {
@@ -113,12 +123,9 @@ public void onResume() {
             radioButton.setText(url);
             radioGroup.addView(radioButton);
             final QrFragment fragment = this;
-            radioButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Bitmap qr = fragment.generateQr(url, darkMode);
-                    fragment.qrImage.setImageBitmap(qr);
-                }
+            radioButton.setOnClickListener(v -> {
+                Bitmap qr = fragment.generateQr(url, darkMode);
+                fragment.qrImage.setImageBitmap(qr);
             });
         }
         urlsParent.addView(radioGroup);