mirror of
https://codeberg.org/monocles/monocles_chat.git
synced 2025-01-25 22:44:11 +01:00
Fix asking for contact permission
This commit is contained in:
parent
a5c4fb0cf3
commit
9f7fee4033
1 changed files with 2 additions and 5 deletions
|
@ -558,7 +558,7 @@ public class StartConversationActivity extends XmppActivity
|
|||
super.onStart();
|
||||
mConferenceAdapter.refreshSettings();
|
||||
mContactsAdapter.refreshSettings();
|
||||
if (pendingViewIntent.peek() == null) {
|
||||
if (!createdByViewIntent) {
|
||||
askForContactsPermissions();
|
||||
requestNotificationPermissionIfNeeded();
|
||||
}
|
||||
|
@ -1080,10 +1080,7 @@ public class StartConversationActivity extends XmppActivity
|
|||
final String consent =
|
||||
PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
|
||||
.getString(PREF_KEY_CONTACT_INTEGRATION_CONSENT, null);
|
||||
final boolean requiresConsent =
|
||||
(QuickConversationsService.isQuicksy()
|
||||
|| QuickConversationsService.isPlayStoreFlavor())
|
||||
&& !"agreed".equals(consent);
|
||||
final boolean requiresConsent = !"agreed".equals(consent);
|
||||
if (requiresConsent && "declined".equals(consent)) {
|
||||
Log.d(
|
||||
Config.LOGTAG,
|
||||
|
|
Loading…
Add table
Reference in a new issue