thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 5 Pull requests 1 Wiki Activity Actions 1

Code cleanup

Browse source
This commit is contained in:
Arne 2024-11-12 19:15:30 +01:00
parent 25f20f8786
commit cd51d2f46a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/monocleschat/java/eu/siacs/conversations/ui/ManageAccountActivity.java
View file

@ -225,7 +225,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
if (this.mPostponedActivityResult != null) { if (this.mPostponedActivityResult != null) {
this.onActivityResult(mPostponedActivityResult.first, RESULT_OK, mPostponedActivityResult.second); this.onActivityResult(mPostponedActivityResult.first, RESULT_OK, mPostponedActivityResult.second);
} }
if (Config.X509_VERIFICATION && this.accountList.size() == 0) { if (Config.X509_VERIFICATION && this.accountList.isEmpty()) {
if (mInvokedAddAccount.compareAndSet(false, true)) { if (mInvokedAddAccount.compareAndSet(false, true)) {
addAccountFromKey(); addAccountFromKey();
} }
@ -333,13 +333,14 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
@Override @Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (grantResults.length > 0) { if (grantResults.length > 0) {
if (allGranted(grantResults)) { if (allGranted(grantResults)) {
switch (requestCode) { switch (requestCode) {
case REQUEST_MICROPHONE: case REQUEST_MICROPHONE:
try { try {
startActivity(mMicIntent); startActivity(mMicIntent);
} catch (final android.content.ActivityNotFoundException e) { } catch (final ActivityNotFoundException e) {
Toast.makeText(this, "Your OS has blocked dialler integration", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "Your OS has blocked dialler integration", Toast.LENGTH_SHORT).show();
} }
mMicIntent = null; mMicIntent = null;
@ -365,7 +366,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
@Override @Override
public boolean onNavigateUp() { public boolean onNavigateUp() {
if (xmppConnectionService.getConversations().size() == 0) { if (xmppConnectionService.getConversations().isEmpty()) {
Intent contactsIntent = new Intent(this, Intent contactsIntent = new Intent(this,
StartConversationActivity.class); StartConversationActivity.class);
contactsIntent.setFlags( contactsIntent.setFlags(