TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tap jacking bug

Browse Source
This commit is contained in:
Niels Andriesse 2020-12-04 13:40:10 +11:00
parent b4d66e9e81
commit 46452977fc
8 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout-sw400dp/activity_register.xml
View File

@ -30,7 +30,7 @@
android:textColor="@color/text" android:textColor="@color/text"
android:text="@string/activity_register_explanation" /> android:text="@string/activity_register_explanation" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView <TextView
style="@style/SessionIDTextView" style="@style/SessionIDTextView"
android:id="@+id/publicKeyTextView" android:id="@+id/publicKeyTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -54,7 +54,7 @@
android:layout_marginRight="@dimen/massive_spacing" android:layout_marginRight="@dimen/massive_spacing"
android:text="@string/continue_2" /> android:text="@string/continue_2" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton <Button
style="@style/Widget.Session.Button.Common.ProminentOutline" style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/copyButton" android:id="@+id/copyButton"
android:layout_width="match_parent" android:layout_width="match_parent"

6
res/layout-sw400dp/activity_seed.xml
View File

@ -36,7 +36,7 @@
android:textColor="@color/text" android:textColor="@color/text"
android:text="@string/activity_seed_explanation" /> android:text="@string/activity_seed_explanation" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView <TextView
style="@style/SessionIDTextView" style="@style/SessionIDTextView"
android:id="@+id/seedTextView" android:id="@+id/seedTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -49,7 +49,7 @@
android:textAlignment="center" android:textAlignment="center"
android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" /> android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView <TextView
android:id="@+id/revealButton" android:id="@+id/revealButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -65,7 +65,7 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"/> android:layout_weight="1"/>
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton <Button
style="@style/Widget.Session.Button.Common.ProminentOutline" style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/copyButton" android:id="@+id/copyButton"
android:layout_width="196dp" android:layout_width="196dp"

6
res/layout-sw400dp/fragment_enter_public_key.xml
View File

@ -50,7 +50,7 @@
android:layout_marginTop="@dimen/large_spacing" android:layout_marginTop="@dimen/large_spacing"
android:layout_marginRight="@dimen/large_spacing" /> android:layout_marginRight="@dimen/large_spacing" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView <TextView
android:id="@+id/publicKeyTextView" android:id="@+id/publicKeyTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -71,7 +71,7 @@
android:layout_marginRight="@dimen/large_spacing" android:layout_marginRight="@dimen/large_spacing"
android:orientation="horizontal"> android:orientation="horizontal">
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton <Button
style="@style/Widget.Session.Button.Common.UnimportantFilled" style="@style/Widget.Session.Button.Common.UnimportantFilled"
android:id="@+id/copyButton" android:id="@+id/copyButton"
android:layout_width="0dp" android:layout_width="0dp"
@ -79,7 +79,7 @@
android:layout_weight="1" android:layout_weight="1"
android:text="@string/copy" /> android:text="@string/copy" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton <Button
style="@style/Widget.Session.Button.Common.UnimportantFilled" style="@style/Widget.Session.Button.Common.UnimportantFilled"
android:id="@+id/shareButton" android:id="@+id/shareButton"
android:layout_width="0dp" android:layout_width="0dp"

4
res/layout/activity_register.xml
View File

@ -30,7 +30,7 @@
android:textColor="@color/text" android:textColor="@color/text"
android:text="@string/activity_register_explanation" /> android:text="@string/activity_register_explanation" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView <TextView
style="@style/SessionIDTextView" style="@style/SessionIDTextView"
android:id="@+id/publicKeyTextView" android:id="@+id/publicKeyTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -55,7 +55,7 @@
android:layout_marginRight="@dimen/massive_spacing" android:layout_marginRight="@dimen/massive_spacing"
android:text="@string/continue_2" /> android:text="@string/continue_2" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton <Button
style="@style/Widget.Session.Button.Common.ProminentOutline" style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/copyButton" android:id="@+id/copyButton"
android:layout_width="match_parent" android:layout_width="match_parent"

6
res/layout/activity_seed.xml
View File

@ -36,7 +36,7 @@
android:textColor="@color/text" android:textColor="@color/text"
android:text="@string/activity_seed_explanation" /> android:text="@string/activity_seed_explanation" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView <TextView
style="@style/SessionIDTextView" style="@style/SessionIDTextView"
android:id="@+id/seedTextView" android:id="@+id/seedTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -49,7 +49,7 @@
android:textAlignment="center" android:textAlignment="center"
android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" /> android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView <TextView
android:id="@+id/revealButton" android:id="@+id/revealButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -66,7 +66,7 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"/> android:layout_weight="1"/>
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton <Button
style="@style/Widget.Session.Button.Common.ProminentOutline" style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/copyButton" android:id="@+id/copyButton"
android:layout_width="196dp" android:layout_width="196dp"

4
res/layout/dialog_seed.xml
View File

@ -20,7 +20,7 @@
android:textAlignment="center" android:textAlignment="center"
android:textSize="@dimen/medium_font_size" /> android:textSize="@dimen/medium_font_size" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView <TextView
style="@style/SessionIDTextView" style="@style/SessionIDTextView"
android:id="@+id/seedTextView" android:id="@+id/seedTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -56,7 +56,7 @@
android:layout_weight="1" android:layout_weight="1"
android:text="@string/cancel" /> android:text="@string/cancel" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton <Button
style="@style/Widget.Session.Button.Dialog.Unimportant" style="@style/Widget.Session.Button.Dialog.Unimportant"
android:id="@+id/copyButton" android:id="@+id/copyButton"
android:layout_width="0dp" android:layout_width="0dp"

6
res/layout/fragment_enter_public_key.xml
View File

@ -49,7 +49,7 @@
android:layout_marginTop="@dimen/large_spacing" android:layout_marginTop="@dimen/large_spacing"
android:layout_marginRight="@dimen/large_spacing" /> android:layout_marginRight="@dimen/large_spacing" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView <TextView
android:id="@+id/publicKeyTextView" android:id="@+id/publicKeyTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -70,7 +70,7 @@
android:layout_marginRight="@dimen/large_spacing" android:layout_marginRight="@dimen/large_spacing"
android:orientation="horizontal"> android:orientation="horizontal">
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton <Button
style="@style/Widget.Session.Button.Common.UnimportantFilled" style="@style/Widget.Session.Button.Common.UnimportantFilled"
android:id="@+id/copyButton" android:id="@+id/copyButton"
android:layout_width="0dp" android:layout_width="0dp"
@ -78,7 +78,7 @@
android:layout_weight="1" android:layout_weight="1"
android:text="@string/copy" /> android:text="@string/copy" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton <Button
style="@style/Widget.Session.Button.Common.UnimportantFilled" style="@style/Widget.Session.Button.Common.UnimportantFilled"
android:id="@+id/shareButton" android:id="@+id/shareButton"
android:layout_width="0dp" android:layout_width="0dp"

3
src/org/thoughtcrime/securesms/conversation/ConversationItem.java
View File

@ -89,7 +89,6 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.loki.utilities.MentionUtilities; import org.thoughtcrime.securesms.loki.utilities.MentionUtilities;
import org.thoughtcrime.securesms.loki.views.ProfilePictureView; import org.thoughtcrime.securesms.loki.views.ProfilePictureView;
import org.thoughtcrime.securesms.loki.views.TapJackingProofLinearLayout;
import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.mms.ImageSlide; import org.thoughtcrime.securesms.mms.ImageSlide;
import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.mms.PartAuthority;
@ -130,7 +129,7 @@ import network.loki.messenger.R;
* *
*/ */
public class ConversationItem extends TapJackingProofLinearLayout public class ConversationItem extends LinearLayout
implements RecipientModifiedListener, BindableConversationItem implements RecipientModifiedListener, BindableConversationItem
{ {
private static final String TAG = ConversationItem.class.getSimpleName(); private static final String TAG = ConversationItem.class.getSimpleName();