mirror of
https://github.com/oxen-io/session-android.git
synced 2023-12-14 02:53:01 +01:00
18039bc3f4
Currently, if you're searching for a contact to start a conversation with or send a share to (via the Android sharing system), groups do not appear. With this change, groups will now appear when searching, located under their own heading. Fixes #7202. Closes #7577
150 lines
4.9 KiB
Java
150 lines
4.9 KiB
Java
/*
|
|
* Copyright (C) 2015 Open Whisper Systems
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.thoughtcrime.securesms;
|
|
|
|
import android.content.Context;
|
|
import android.os.AsyncTask;
|
|
import android.os.Bundle;
|
|
import android.support.v4.widget.SwipeRefreshLayout;
|
|
import android.util.Log;
|
|
|
|
import org.thoughtcrime.securesms.components.ContactFilterToolbar;
|
|
import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
|
|
import org.thoughtcrime.securesms.util.DirectoryHelper;
|
|
import org.thoughtcrime.securesms.util.DynamicLanguage;
|
|
import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
|
|
import org.thoughtcrime.securesms.util.DynamicTheme;
|
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
|
import org.thoughtcrime.securesms.util.ViewUtil;
|
|
|
|
import java.io.IOException;
|
|
import java.lang.ref.WeakReference;
|
|
|
|
/**
|
|
* Base activity container for selecting a list of contacts.
|
|
*
|
|
* @author Moxie Marlinspike
|
|
*
|
|
*/
|
|
public abstract class ContactSelectionActivity extends PassphraseRequiredActionBarActivity
|
|
implements SwipeRefreshLayout.OnRefreshListener,
|
|
ContactSelectionListFragment.OnContactSelectedListener
|
|
{
|
|
private static final String TAG = ContactSelectionActivity.class.getSimpleName();
|
|
|
|
private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
|
|
private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
|
|
|
|
protected ContactSelectionListFragment contactsFragment;
|
|
|
|
private ContactFilterToolbar toolbar;
|
|
|
|
@Override
|
|
protected void onPreCreate() {
|
|
dynamicTheme.onCreate(this);
|
|
dynamicLanguage.onCreate(this);
|
|
}
|
|
|
|
@Override
|
|
protected void onCreate(Bundle icicle, boolean ready) {
|
|
if (!getIntent().hasExtra(ContactSelectionListFragment.DISPLAY_MODE)) {
|
|
int displayMode = TextSecurePreferences.isSmsEnabled(this) ? DisplayMode.FLAG_ALL
|
|
: DisplayMode.FLAG_PUSH | DisplayMode.FLAG_GROUPS;
|
|
getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, displayMode);
|
|
}
|
|
|
|
setContentView(R.layout.contact_selection_activity);
|
|
|
|
initializeToolbar();
|
|
initializeResources();
|
|
initializeSearch();
|
|
}
|
|
|
|
@Override
|
|
public void onResume() {
|
|
super.onResume();
|
|
dynamicTheme.onResume(this);
|
|
dynamicLanguage.onResume(this);
|
|
}
|
|
|
|
protected ContactFilterToolbar getToolbar() {
|
|
return toolbar;
|
|
}
|
|
|
|
private void initializeToolbar() {
|
|
this.toolbar = ViewUtil.findById(this, R.id.toolbar);
|
|
setSupportActionBar(toolbar);
|
|
|
|
assert getSupportActionBar() != null;
|
|
getSupportActionBar().setDisplayHomeAsUpEnabled(false);
|
|
getSupportActionBar().setDisplayShowTitleEnabled(false);
|
|
getSupportActionBar().setIcon(null);
|
|
getSupportActionBar().setLogo(null);
|
|
}
|
|
|
|
private void initializeResources() {
|
|
contactsFragment = (ContactSelectionListFragment) getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
|
|
contactsFragment.setOnContactSelectedListener(this);
|
|
contactsFragment.setOnRefreshListener(this);
|
|
}
|
|
|
|
private void initializeSearch() {
|
|
toolbar.setOnFilterChangedListener(filter -> contactsFragment.setQueryFilter(filter));
|
|
}
|
|
|
|
@Override
|
|
public void onRefresh() {
|
|
new RefreshDirectoryTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, getApplicationContext());
|
|
}
|
|
|
|
@Override
|
|
public void onContactSelected(String number) {}
|
|
|
|
@Override
|
|
public void onContactDeselected(String number) {}
|
|
|
|
private static class RefreshDirectoryTask extends AsyncTask<Context, Void, Void> {
|
|
|
|
private final WeakReference<ContactSelectionActivity> activity;
|
|
|
|
private RefreshDirectoryTask(ContactSelectionActivity activity) {
|
|
this.activity = new WeakReference<>(activity);
|
|
}
|
|
|
|
@Override
|
|
protected Void doInBackground(Context... params) {
|
|
|
|
try {
|
|
DirectoryHelper.refreshDirectory(params[0], true);
|
|
} catch (IOException e) {
|
|
Log.w(TAG, e);
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
@Override
|
|
protected void onPostExecute(Void result) {
|
|
ContactSelectionActivity activity = this.activity.get();
|
|
|
|
if (activity != null && !activity.isFinishing()) {
|
|
activity.toolbar.clear();
|
|
activity.contactsFragment.resetQueryFilter();
|
|
}
|
|
}
|
|
}
|
|
}
|