empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update API for Activity in bubble check.

Browse source
This commit is contained in:
Aaron Labiaga 2021-06-11 07:37:31 -04:00 • committed by Cody Henthorne
parent 1c80e65c5a
commit 908f952893
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/conversation/BubbleConversationActivity.java
View file

@ -3,8 +3,13 @@ package org.thoughtcrime.securesms.conversation;
/**
* Activity which encapsulates a conversation for a Bubble window.
*
* This activity is empty, and exists so that we can override some of its manifest parameters
* without clashing with ConversationActivity.
* This activity exists so that we can override some of its manifest parameters
* without clashing with {@link ConversationActivity} and provide an API-level
* independent "is in bubble?" check.
*/
public class BubbleConversationActivity extends ConversationActivity {
@Override
protected boolean isInBubble() {
return true;
}
}

11
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View file

@ -66,6 +66,7 @@ import android.widget.Toast;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.WorkerThread;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
@ -2083,14 +2084,8 @@ public class ConversationActivity extends PassphraseRequiredActivity
}
}
private boolean isInBubble() {
if (Build.VERSION.SDK_INT >= ConversationUtil.CONVERSATION_SUPPORT_VERSION) {
Display display = getDisplay();
return display != null && display.getDisplayId() != Display.DEFAULT_DISPLAY;
} else {
return false;
}
protected boolean isInBubble() {
return false;
}
private void initializeResources(@NonNull ConversationIntents.Args args) {