aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java58
1 files changed, 39 insertions, 19 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java b/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
index 1dee03021..77892c16e 100644
--- a/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
@@ -6,6 +6,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.text.Html;
import android.view.KeyEvent;
import android.view.Menu;
@@ -28,21 +29,27 @@ import de.pixart.messenger.databinding.ActivityChannelDiscoveryBinding;
import de.pixart.messenger.entities.Account;
import de.pixart.messenger.entities.Bookmark;
import de.pixart.messenger.entities.Conversation;
-import de.pixart.messenger.http.services.MuclumbusService;
+import de.pixart.messenger.entities.Room;
import de.pixart.messenger.services.ChannelDiscoveryService;
import de.pixart.messenger.ui.adapter.ChannelSearchResultAdapter;
import de.pixart.messenger.ui.util.PendingItem;
import de.pixart.messenger.ui.util.SoftKeyboardUtils;
+import de.pixart.messenger.ui.util.StyledAttributes;
import de.pixart.messenger.utils.AccountUtils;
import rocks.xmpp.addr.Jid;
public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.OnActionExpandListener, TextView.OnEditorActionListener, ChannelDiscoveryService.OnChannelSearchResultsFound, ChannelSearchResultAdapter.OnChannelSearchResultSelected {
+
private static final String CHANNEL_DISCOVERY_OPT_IN = "channel_discovery_opt_in";
+
private final ChannelSearchResultAdapter adapter = new ChannelSearchResultAdapter();
private final PendingItem<String> mInitialSearchValue = new PendingItem<>();
private ActivityChannelDiscoveryBinding binding;
private MenuItem mMenuSearchView;
private EditText mSearchEditText;
+
+ private ChannelDiscoveryService.Method method = ChannelDiscoveryService.Method.LOCAL_SERVER;
+
private boolean optedIn = false;
@Override
@@ -52,14 +59,15 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
@Override
void onBackendConnected() {
- if (optedIn) {
- String query;
+ if (optedIn || method == ChannelDiscoveryService.Method.LOCAL_SERVER) {
+ final String query;
if (mMenuSearchView != null && mMenuSearchView.isActionViewExpanded()) {
query = mSearchEditText.getText().toString();
} else {
query = mInitialSearchValue.peek();
}
- xmppConnectionService.discoverChannels(query, this);
+ toggleLoadingScreen();
+ xmppConnectionService.discoverChannels(query, this.method, this);
}
}
@@ -71,7 +79,7 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
configureActionBar(getSupportActionBar(), true);
binding.list.setAdapter(this.adapter);
this.adapter.setOnChannelSearchResultSelectedListener(this);
- optedIn = getPreferences().getBoolean(CHANNEL_DISCOVERY_OPT_IN, false);
+ this.optedIn = getPreferences().getBoolean(CHANNEL_DISCOVERY_OPT_IN, false);
final String search = savedInstanceState == null ? null : savedInstanceState.getString("search");
if (search != null) {
@@ -79,20 +87,30 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
}
}
+ private static ChannelDiscoveryService.Method getMethod(final Context c) {
+ final SharedPreferences p = PreferenceManager.getDefaultSharedPreferences(c);
+ final String m = p.getString("channel_discovery_method", c.getString(R.string.default_channel_discovery));
+ try {
+ return ChannelDiscoveryService.Method.valueOf(m);
+ } catch (IllegalArgumentException e) {
+ return ChannelDiscoveryService.Method.JABBER_NETWORK;
+ }
+ }
+
@Override
public boolean onCreateOptionsMenu(final Menu menu) {
- getMenuInflater().inflate(R.menu.muc_users_activity, menu);
+ getMenuInflater().inflate(R.menu.channel_discovery_activity, menu);
mMenuSearchView = menu.findItem(R.id.action_search);
final View mSearchView = mMenuSearchView.getActionView();
mSearchEditText = mSearchView.findViewById(R.id.search_field);
mSearchEditText.setHint(R.string.search_channels);
- String initialSearchValue = mInitialSearchValue.pop();
+ final String initialSearchValue = mInitialSearchValue.pop();
if (initialSearchValue != null) {
mMenuSearchView.expandActionView();
mSearchEditText.append(initialSearchValue);
mSearchEditText.requestFocus();
- if (optedIn && xmppConnectionService != null) {
- xmppConnectionService.discoverChannels(initialSearchValue, this);
+ if ((optedIn || method == ChannelDiscoveryService.Method.LOCAL_SERVER) && xmppConnectionService != null) {
+ xmppConnectionService.discoverChannels(initialSearchValue, this.method, this);
}
}
mSearchEditText.setOnEditorActionListener(this);
@@ -116,8 +134,8 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
imm.hideSoftInputFromWindow(mSearchEditText.getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY);
mSearchEditText.setText("");
toggleLoadingScreen();
- if (optedIn) {
- xmppConnectionService.discoverChannels(null, this);
+ if (optedIn || method == ChannelDiscoveryService.Method.LOCAL_SERVER) {
+ xmppConnectionService.discoverChannels(null, this.method, this);
}
return true;
}
@@ -125,12 +143,14 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
private void toggleLoadingScreen() {
adapter.submitList(Collections.emptyList());
binding.progressBar.setVisibility(View.VISIBLE);
+ binding.list.setBackgroundColor(StyledAttributes.getColor(this, R.attr.color_background_primary));
}
@Override
public void onStart() {
super.onStart();
- if (!optedIn) {
+ this.method = getMethod(this);
+ if (!optedIn && method == ChannelDiscoveryService.Method.JABBER_NETWORK) {
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.channel_discovery_opt_in_title);
builder.setMessage(Html.fromHtml(getString(R.string.channel_discover_opt_in_message)));
@@ -155,21 +175,21 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
SharedPreferences preferences = getPreferences();
preferences.edit().putBoolean(CHANNEL_DISCOVERY_OPT_IN, true).apply();
optedIn = true;
- xmppConnectionService.discoverChannels(null, this);
+ xmppConnectionService.discoverChannels(null, this.method, this);
}
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
- if (optedIn) {
+ if (optedIn || method == ChannelDiscoveryService.Method.LOCAL_SERVER) {
toggleLoadingScreen();
SoftKeyboardUtils.hideSoftKeyboard(this);
- xmppConnectionService.discoverChannels(v.getText().toString(), this);
+ xmppConnectionService.discoverChannels(v.getText().toString(), this.method, this);
}
return true;
}
@Override
- public void onChannelSearchResultsFound(final List<MuclumbusService.Room> results) {
+ public void onChannelSearchResultsFound(final List<Room> results) {
runOnUiThread(() -> {
adapter.submitList(results);
if (results.size() > 0) {
@@ -185,7 +205,7 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
}
@Override
- public void onChannelSearchResult(final MuclumbusService.Room result) {
+ public void onChannelSearchResult(final Room result) {
List<String> accounts = AccountUtils.getEnabledAccounts(xmppConnectionService);
if (accounts.size() == 1) {
joinChannelSearchResult(accounts.get(0), result);
@@ -202,7 +222,7 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
@Override
public boolean onContextItemSelected(MenuItem item) {
- final MuclumbusService.Room room = adapter.getCurrent();
+ final Room room = adapter.getCurrent();
if (room != null) {
switch (item.getItemId()) {
case R.id.share_with:
@@ -220,7 +240,7 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
return false;
}
- public void joinChannelSearchResult(String selectedAccount, MuclumbusService.Room result) {
+ public void joinChannelSearchResult(String selectedAccount, Room result) {
final Jid jid = Config.DOMAIN_LOCK == null ? Jid.of(selectedAccount) : Jid.of(selectedAccount, Config.DOMAIN_LOCK, null);
final boolean syncAutoJoin = getBooleanPreference("autojoin", R.bool.autojoin);
final Account account = xmppConnectionService.findAccountByJid(jid);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 08:37:32 +0000