mirror/monocles_chat
1
0
Fork 1
mirror of https://codeberg.org/monocles/monocles_chat.git synced 2025-01-27 15:34:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix asking for contact permission

Browse source
This commit is contained in:
Stephen Paul Weber 2024-10-23 04:28:53 +02:00 • committed by Arne
parent a5c4fb0cf3
commit 9f7fee4033
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View file

@ -558,7 +558,7 @@ public class StartConversationActivity extends XmppActivity
super.onStart(); super.onStart();
mConferenceAdapter.refreshSettings(); mConferenceAdapter.refreshSettings();
mContactsAdapter.refreshSettings(); mContactsAdapter.refreshSettings();
if (pendingViewIntent.peek() == null) { if (!createdByViewIntent) {
askForContactsPermissions(); askForContactsPermissions();
requestNotificationPermissionIfNeeded(); requestNotificationPermissionIfNeeded();
} }
@ -1080,10 +1080,7 @@ public class StartConversationActivity extends XmppActivity
final String consent = final String consent =
PreferenceManager.getDefaultSharedPreferences(getApplicationContext()) PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
.getString(PREF_KEY_CONTACT_INTEGRATION_CONSENT, null); .getString(PREF_KEY_CONTACT_INTEGRATION_CONSENT, null);
final boolean requiresConsent = final boolean requiresConsent = !"agreed".equals(consent);
(QuickConversationsService.isQuicksy()
|| QuickConversationsService.isPlayStoreFlavor())
&& !"agreed".equals(consent);
if (requiresConsent && "declined".equals(consent)) { if (requiresConsent && "declined".equals(consent)) {
Log.d( Log.d(
Config.LOGTAG, Config.LOGTAG,