From f429017122e825d7ffca3ecdf1b0abada59f572d Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Tue, 26 Jul 2022 15:19:59 -0500
Subject: [PATCH 1/2] Don't show instance search results if there aren't any.

---
 .../ui/fragment/login/FragmentLoginMain.java  | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginMain.java b/app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginMain.java
index 0dc503d1d..5c1fdf061 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginMain.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginMain.java
@@ -104,17 +104,21 @@ public class FragmentLoginMain extends Fragment {
                         InstanceSocialVM instanceSocialVM = new ViewModelProvider(FragmentLoginMain.this).get(InstanceSocialVM.class);
                         instanceSocialVM.getInstances(query).observe(requireActivity(), instanceSocialList -> {
                             binding.loginInstance.setAdapter(null);
-                            String[] instances = new String[instanceSocialList.instances.size()];
-                            int j = 0;
-                            for (InstanceSocial.Instance instance : instanceSocialList.instances) {
-                                instances[j] = instance.name;
-                                j++;
+                            if (instanceSocialList.instances.isEmpty()) {
+                                binding.loginInstance.dismissDropDown();
+                            } else {
+                                String[] instances = new String[instanceSocialList.instances.size()];
+                                int j = 0;
+                                for (InstanceSocial.Instance instance : instanceSocialList.instances) {
+                                    instances[j] = instance.name;
+                                    j++;
+                                }
+                                ArrayAdapter<String> adapter = new ArrayAdapter<>(requireActivity(),
+                                        android.R.layout.simple_list_item_1, instances);
+                                binding.loginInstance.setAdapter(adapter);
+                                if (binding.loginInstance.hasFocus() && !requireActivity().isFinishing())
+                                    binding.loginInstance.showDropDown();
                             }
-                            ArrayAdapter<String> adapter =
-                                    new ArrayAdapter<>(requireActivity(), android.R.layout.simple_list_item_1, instances);
-                            binding.loginInstance.setAdapter(adapter);
-                            if (binding.loginInstance.hasFocus() && !requireActivity().isFinishing())
-                                binding.loginInstance.showDropDown();
                             if (oldSearch != null && oldSearch.equals(binding.loginInstance.getText().toString())) {
                                 binding.loginInstance.dismissDropDown();
                             }

From 316b815d01c590184114b17d62447a657775b7b9 Mon Sep 17 00:00:00 2001
From: RintanBroadleaf <rintanbroadleaf@outlook.jp>
Date: Wed, 27 Jul 2022 10:51:30 +0000
Subject: [PATCH 2/2] Translated using Weblate (Japanese)

Currently translated at 94.4% (695 of 736 strings)

Translation: Fedilab/Strings
Translate-URL: https://hosted.weblate.org/projects/fedilab/strings/ja/
---
 app/src/main/res/values-ja/strings.xml | 39 ++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 9ca5a2e44..c6ef96a25 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -672,4 +672,43 @@
     <string name="is_down">ダウンしています！</string>
     <string name="customize_timelines">タイムラインをカスタマイズ</string>
     <string name="pref_theme_base">テーマのベース</string>
+    <string name="bottom_menu">ボトムメニュー</string>
+    <string name="origin_report">報告されたアカウントのサーバー</string>
+    <string name="resolved">解決済み</string>
+    <string name="fetch_more_messages">さらにメッセージを読み込む…</string>
+    <string name="messages_in_cache_for_home">ホームのメッセージのキャッシュ</string>
+    <string name="types_of_notifications_to_display">表示する通知の種類</string>
+    <string name="set_display_bookmark_indication">ブックマークボタンを常に表示する</string>
+    <string name="also_boosted_by">次のユーザーにもブーストされています:</string>
+    <string name="label_rectangle">長方形</string>
+    <string name="label_line">線形</string>
+    <string name="msg_save_image">画像を保存せずに終了しますか？</string>
+    <string name="tap_here_to_refresh_poll">ここをタップして投票を更新</string>
+    <string name="status">ステータス</string>
+    <string name="label_eraser_mode">消しゴムモード</string>
+    <string name="delete_cache">キャッシュを消去</string>
+    <string name="admin_scope">私はモデレーターです</string>
+    <string name="label_oval">楕円</string>
+    <string name="action_announcement_from_to">アナウンス・%1$s - %2$s</string>
+    <string name="messages_in_cache_for_other_timelines">他のタイムラインのメッセージのキャッシュ</string>
+    <string name="messages_stored_in_drafts">下書きのメッセージ</string>
+    <string name="files_cache_size">ファイルキャッシュのサイズ</string>
+    <string name="clear_cache">キャッシュを消去</string>
+    <string name="most_recent">直近</string>
+    <string name="filter">フィルター</string>
+    <string name="domain">ドメイン</string>
+    <string name="approved">承認済み</string>
+    <string name="approve">承認</string>
+    <string name="display">表示</string>
+    <string name="more_actions">他の操作</string>
+    <string name="set_unfollow_validation_title">フォロー解除の確認</string>
+    <string name="message_has_been_sent">メッセージが送信されました！</string>
+    <string name="poll_type">アンケートの種類:</string>
+    <string name="poll_duration">アンケートの期間:</string>
+    <string name="top_menu">トップバーメニュー</string>
+    <string name="also_favourite_by">"次のユーザーにもフォローされています: "</string>
+    <string name="last_active">最終活動日</string>
+    <string name="location">場所</string>
+    <string name="staff">スタッフ</string>
+    <string name="label_shape">形</string>
 </resources>
\ No newline at end of file