yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 17:59:39 +02:00
Code Issues Releases Wiki Activity

rename blocked-contacts-activity

Browse source 
`BlockedAndShareContactsActivity` is no longer used for sharing contacts,
this was always a misleading name
and is done since #2719 by `AttachContactActivity`.
This commit is contained in:
B. Petersen 2023-10-05 22:02:09 +02:00 • committed by bjoern
parent b73c33ad20
commit ac1f2ebdd9
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -277,7 +277,7 @@
android:theme="@style/TextSecure.LightTheme" android:theme="@style/TextSecure.LightTheme"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
<activity android:name=".BlockedAndShareContactsActivity" <activity android:name=".BlockedContactsActivity"
android:theme="@style/TextSecure.LightTheme" android:theme="@style/TextSecure.LightTheme"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

6
src/org/thoughtcrime/securesms/BlockedAndShareContactsActivity.java → src/org/thoughtcrime/securesms/BlockedContactsActivity.java
View file

@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.ViewUtil;
public class BlockedAndShareContactsActivity extends PassphraseRequiredActionBarActivity { public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity {
@Override @Override
public void onCreate(Bundle bundle, boolean ready) { public void onCreate(Bundle bundle, boolean ready) {
@ -136,9 +136,7 @@ public class BlockedAndShareContactsActivity extends PassphraseRequiredActionBar
} }
@Override @Override
public void onItemLongClick(ContactSelectionListItem view) { public void onItemLongClick(ContactSelectionListItem view) {}
// Not needed
}
} }
} }

4
src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
View file

@ -21,7 +21,7 @@ import androidx.preference.Preference;
import com.b44t.messenger.DcContext; import com.b44t.messenger.DcContext;
import org.thoughtcrime.securesms.ApplicationPreferencesActivity; import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
import org.thoughtcrime.securesms.BlockedAndShareContactsActivity; import org.thoughtcrime.securesms.BlockedContactsActivity;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.permissions.Permissions;
@ -185,7 +185,7 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
private class BlockedContactsClickListener implements Preference.OnPreferenceClickListener { private class BlockedContactsClickListener implements Preference.OnPreferenceClickListener {
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
Intent intent = new Intent(getActivity(), BlockedAndShareContactsActivity.class); Intent intent = new Intent(getActivity(), BlockedContactsActivity.class);
startActivity(intent); startActivity(intent);
return true; return true;
} }