awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

tweak contact deletion, closes #83

Browse Source
This commit is contained in:
B. Petersen
2018-10-10 15:53:02 +02:00
parent eaabc75501
commit 62e03e7ce4
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/values/strings.xml
+1 -1
View File
@@ -751,7 +751,7 @@
<string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Error retrieving contacts, check your network connection</string>
<string name="ContactSelectionListFragment_error_deleting_contacts_check_existing_conversations">Error deleting contacts, some contacts couldn\'t get deleted. Please delete existing conversations before.</string>
<string name="ContactSelectionListFragment_contact_delete_confirmation_title">Delete contacts?</string>
<string name="ContactSelectionListFragment_contact_delete_confirmation_message">This will permanently delete the selected contacts. Only contacts without ongoing conversations will be deleted. If the contact permission is granted, local phone contacts will be automatically added again on reopening.</string>
<string name="ContactSelectionListFragment_contact_delete_confirmation_message">This will permanently delete the selected contacts.\n\nContacts with ongoing chats and contacts from the system\'s address book cannot be deleted permanently.</string>
<!-- blocked_contacts_fragment -->
<string name="blocked_contacts_fragment__no_blocked_contacts">No blocked contacts</string>
src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+10 -5
View File
@@ -19,6 +19,8 @@ package org.thoughtcrime.securesms;
import android.Manifest;
import android.annotation.SuppressLint;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
@@ -27,10 +29,11 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.Loader;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.view.ActionMode;
import android.util.SparseIntArray;
import android.view.ActionMode;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -162,9 +165,11 @@ public class ContactSelectionListFragment extends Fragment
public void onDestroyActionMode(ActionMode actionMode) {
ContactSelectionListFragment.this.actionMode = null;
getContactSelectionListAdapter().resetActionModeSelection();
ContactSelectionActivity activity = (ContactSelectionActivity) getActivity();
if (activity != null) {
activity.getToolbar().setBackgroundColor(getResources().getColor(R.color.textsecure_primary));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
TypedArray color = getActivity().getTheme().obtainStyledAttributes(new int[] {android.R.attr.statusBarColor});
getActivity().getWindow().setStatusBarColor(color.getColor(0, Color.BLACK));
color.recycle();
}
}
};
@@ -362,7 +367,7 @@ public class ContactSelectionListFragment extends Fragment
@Override
public void onItemLongClick(ContactSelectionListItem view) {
if (actionMode == null) {
actionMode = Objects.requireNonNull(getActivity()).startActionMode(actionModeCallback);
actionMode = ((AppCompatActivity)getActivity()).startSupportActionMode(actionModeCallback);
} else {
finishActionModeIfSelectionIsEmpty();
}