mirror of
https://codeberg.org/monocles/monocles_chat.git
synced 2025-02-17 17:35:27 +01:00
Improve permissions requests for android >= 33
(cherry picked from commit 288cad2cfa
)
This commit is contained in:
parent
1205dc9476
commit
328b87fc0b
4 changed files with 17 additions and 28 deletions
src/main
java/eu/siacs/conversations/ui
res/values
|
@ -280,6 +280,14 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
|
|||
openConversation(conversation, null);
|
||||
}
|
||||
}
|
||||
|
||||
// SDK >= 33 permissions
|
||||
if (Compatibility.runsThirtyThree()) {
|
||||
ActivityCompat.requestPermissions(this,
|
||||
permissions(),
|
||||
1);
|
||||
}
|
||||
|
||||
invalidateActionBarTitle();
|
||||
showDialogsIfMainIsOverview();
|
||||
}
|
||||
|
@ -321,10 +329,10 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
|
|||
if (offerToDownloadStickers()) return;
|
||||
openBatteryOptimizationDialogIfNeeded();
|
||||
xmppConnectionService.rescanStickers();
|
||||
|
||||
new showMemoryWarning(this).execute();
|
||||
showOutdatedVersionWarning();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void showOutdatedVersionWarning() {
|
||||
|
@ -717,12 +725,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
|
|||
|
||||
UpdateHelper.showPopup(this);
|
||||
|
||||
// SDK >= 33 permissions
|
||||
if (Compatibility.runsThirtyThree()) {
|
||||
ActivityCompat.requestPermissions(this,
|
||||
permissions(),
|
||||
1);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -89,6 +89,12 @@ public class WelcomeActivity extends XmppActivity implements XmppConnectionServi
|
|||
|
||||
@Override
|
||||
protected void onBackendConnected() {
|
||||
// SDK >= 33 permissions
|
||||
if (Compatibility.runsThirtyThree()) {
|
||||
ActivityCompat.requestPermissions(this,
|
||||
permissions(),
|
||||
1);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -100,17 +106,12 @@ public class WelcomeActivity extends XmppActivity implements XmppConnectionServi
|
|||
}
|
||||
new InstallReferrerUtils(this);
|
||||
|
||||
// SDK >= 33 permissions
|
||||
if (Compatibility.runsThirtyThree()) {
|
||||
ActivityCompat.requestPermissions(this,
|
||||
permissions(),
|
||||
1);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStop() {
|
||||
super.onStop();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -167,14 +168,6 @@ public class WelcomeActivity extends XmppActivity implements XmppConnectionServi
|
|||
finish();
|
||||
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
|
||||
});
|
||||
|
||||
|
||||
// SDK >= 33 permissions
|
||||
if (Compatibility.runsThirtyThree()) {
|
||||
ActivityCompat.requestPermissions(this,
|
||||
permissions(),
|
||||
1);
|
||||
}
|
||||
}
|
||||
|
||||
public void addInviteUri(Intent to) {
|
||||
|
|
|
@ -512,12 +512,6 @@ public abstract class XmppActivity extends ActionBarActivity {
|
|||
mColorWhite = ContextCompat.getColor(this, R.color.white70);
|
||||
this.mUsingEnterKey = usingEnterKey();
|
||||
|
||||
// SDK >= 33 permissions
|
||||
if (Compatibility.runsThirtyThree()) {
|
||||
ActivityCompat.requestPermissions(this,
|
||||
permissions(),
|
||||
1);
|
||||
}
|
||||
}
|
||||
|
||||
protected boolean isCameraFeatureAvailable() {
|
||||
|
|
|
@ -1347,7 +1347,7 @@
|
|||
<string name="notifications_disabled">Notifications disabled. Please activate them in your android settings.</string>
|
||||
<string name="pref_show_less_avatars">Show less avatars in chats</string>
|
||||
<string name="pref_show_less_avatars_summary">Only necessary avatars in conversations will be shown</string>
|
||||
<string name="no_media_permission">No media storage permission</string>
|
||||
<string name="no_media_permission">Permission not granted</string>
|
||||
<string name="pref_set_text_collapsable">Collapse long text</string>
|
||||
<string name="pref_set_text_collapsable_summary">Collapses text with more than 230 signs</string>
|
||||
<string name="hide_notification">Hide notification</string>
|
||||
|
|
Loading…
Add table
Reference in a new issue