[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/fenix][tor-browser-88.1.3-10.5-1] Bug 40165: Announce v2 onion service deprecation on about:tor



Title: GitLab

Matthew Finkel pushed to branch tor-browser-88.1.3-10.5-1 at The Tor Project / Applications / fenix

Commits:

11 changed files:

Changes:

  • app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
    ... ... @@ -23,6 +23,7 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder
    23 23
     import org.mozilla.fenix.home.sessioncontrol.viewholders.NoCollectionsMessageViewHolder
    
    24 24
     import org.mozilla.fenix.home.sessioncontrol.viewholders.PrivateBrowsingDescriptionViewHolder
    
    25 25
     import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapPagerViewHolder
    
    26
    +import org.mozilla.fenix.home.sessioncontrol.viewholders.TorInfoBannerViewHolder
    
    26 27
     import org.mozilla.fenix.home.sessioncontrol.viewholders.TabInCollectionViewHolder
    
    27 28
     import org.mozilla.fenix.home.sessioncontrol.viewholders.TopSitePagerViewHolder
    
    28 29
     import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.OnboardingAutomaticSignInViewHolder
    
    ... ... @@ -80,6 +81,7 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) {
    80 81
         }
    
    81 82
     
    
    82 83
         object PrivateBrowsingDescription : AdapterItem(PrivateBrowsingDescriptionViewHolder.LAYOUT_ID)
    
    84
    +    object TorInfoBanner : AdapterItem(TorInfoBannerViewHolder.LAYOUT_ID)
    
    83 85
         object NoCollectionsMessage : AdapterItem(NoCollectionsMessageViewHolder.LAYOUT_ID)
    
    84 86
     
    
    85 87
         object TorBootstrap : AdapterItem(TorBootstrapPagerViewHolder.LAYOUT_ID)
    
    ... ... @@ -179,6 +181,10 @@ class SessionControlAdapter(
    179 181
                     view,
    
    180 182
                     interactor
    
    181 183
                 )
    
    184
    +            TorInfoBannerViewHolder.LAYOUT_ID -> TorInfoBannerViewHolder(
    
    185
    +                view,
    
    186
    +                interactor
    
    187
    +            )
    
    182 188
                 TorBootstrapPagerViewHolder.LAYOUT_ID -> TorBootstrapPagerViewHolder(
    
    183 189
                     view,
    
    184 190
                     components,
    

  • app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
    ... ... @@ -93,6 +93,11 @@ interface SessionControlController {
    93 93
          */
    
    94 94
         fun handlePrivateBrowsingLearnMoreClicked()
    
    95 95
     
    
    96
    +    /**
    
    97
    +     * @see [TabSessionInteractor.onTorInfoBannerLaunchClicked]
    
    98
    +     */
    
    99
    +    fun handleTorInfoBannerLaunchClicked()
    
    100
    +
    
    96 101
         /**
    
    97 102
          * @see [TopSiteInteractor.onRenameTopSiteClicked]
    
    98 103
          */
    
    ... ... @@ -620,4 +625,12 @@ class DefaultSessionControlController(
    620 625
         override fun handleTorNetworkSettingsClicked() {
    
    621 626
             openTorNetworkSettings()
    
    622 627
         }
    
    628
    +
    
    629
    +    override fun handleTorInfoBannerLaunchClicked() {
    
    630
    +        activity.openToBrowserAndLoad(
    
    631
    +            searchTermOrURL = SupportUtils.TOR_INFO_BANNER_URL,
    
    632
    +            newTab = true,
    
    633
    +            from = BrowserDirection.FromHome
    
    634
    +        )
    
    635
    +    }
    
    623 636
     }

  • app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt
    ... ... @@ -18,6 +18,12 @@ interface TabSessionInteractor {
    18 18
          * "Common myths about private browsing" link in private mode.
    
    19 19
          */
    
    20 20
         fun onPrivateBrowsingLearnMoreClicked()
    
    21
    +
    
    22
    +    /**
    
    23
    +     * Shows the Info Banner web page in a new tab. Called when a user clicks on the
    
    24
    +     * "Learn More" button.
    
    25
    +     */
    
    26
    +    fun onTorInfoBannerLaunchClicked()
    
    21 27
     }
    
    22 28
     
    
    23 29
     /**
    
    ... ... @@ -361,4 +367,8 @@ class SessionControlInteractor(
    361 367
         override fun onTorBootstrapNetworkSettingsClicked() {
    
    362 368
             controller.handleTorNetworkSettingsClicked()
    
    363 369
         }
    
    370
    +
    
    371
    +    override fun onTorInfoBannerLaunchClicked() {
    
    372
    +        controller.handleTorInfoBannerLaunchClicked()
    
    373
    +    }
    
    364 374
     }

  • app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
    ... ... @@ -66,7 +66,7 @@ private fun showCollections(
    66 66
         }
    
    67 67
     }
    
    68 68
     
    
    69
    -private fun privateModeAdapterItems() = listOf(AdapterItem.PrivateBrowsingDescription)
    
    69
    +private fun privateModeAdapterItems() = listOf(AdapterItem.TorInfoBanner)
    
    70 70
     
    
    71 71
     private fun bootstrapAdapterItems() = listOf(AdapterItem.TorBootstrap)
    
    72 72
     
    

  • app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorInfoBannerViewHolder.kt
    1
    +/* This Source Code Form is subject to the terms of the Mozilla Public
    
    2
    + * License, v. 2.0. If a copy of the MPL was not distributed with this
    
    3
    + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
    
    4
    +
    
    5
    +package org.mozilla.fenix.home.sessioncontrol.viewholders
    
    6
    +
    
    7
    +import android.graphics.Typeface
    
    8
    +import android.text.SpannableString
    
    9
    +import android.text.Spanned
    
    10
    +import android.text.style.StyleSpan
    
    11
    +import android.view.View
    
    12
    +import androidx.recyclerview.widget.RecyclerView
    
    13
    +import kotlinx.android.synthetic.main.tor_info_banner.view.*
    
    14
    +import org.mozilla.fenix.R
    
    15
    +import org.mozilla.fenix.home.sessioncontrol.TabSessionInteractor
    
    16
    +
    
    17
    +class TorInfoBannerViewHolder(
    
    18
    +    view: View,
    
    19
    +    private val interactor: TabSessionInteractor
    
    20
    +) : RecyclerView.ViewHolder(view) {
    
    21
    +
    
    22
    +    init {
    
    23
    +        with(view.info_banner_launch_button) {
    
    24
    +            setOnClickListener {
    
    25
    +                interactor.onTorInfoBannerLaunchClicked()
    
    26
    +            }
    
    27
    +        }
    
    28
    +
    
    29
    +        with(view.info_banner_description) {
    
    30
    +            val spannedString: SpannableString = SpannableString(text)
    
    31
    +            spannedString.setSpan(StyleSpan(Typeface.BOLD), 120, 138,
    
    32
    +                                  Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
    
    33
    +            setText(spannedString)
    
    34
    +        }
    
    35
    +    }
    
    36
    +
    
    37
    +    companion object {
    
    38
    +        const val LAYOUT_ID = R.layout.tor_info_banner
    
    39
    +    }
    
    40
    +}

  • app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
    ... ... @@ -38,6 +38,7 @@ object SupportUtils {
    38 38
         const val DONATE_URL = "https://donate.torproject.org/"
    
    39 39
         const val TB_MANUAL_URL = "https://tb-manual.torproject.org/mobile-tor"
    
    40 40
         const val TOR_RELEASES = "https://www.torproject.org/releases/"
    
    41
    +    const val TOR_INFO_BANNER_URL = "https://support.torproject.org/onionservices/#v2-deprecation"
    
    41 42
     
    
    42 43
         enum class SumoTopic(internal val topicStr: String) {
    
    43 44
             FENIX_MOVING("sync-delist"),
    

  • app/src/main/res/drawable/info_banner_padded_background.xml
    1
    +<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
    
    2
    +   - License, v. 2.0. If a copy of the MPL was not distributed with this
    
    3
    +   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    
    4
    +<ripple xmlns:android="http://schemas.android.com/apk/res/android"
    
    5
    +    android:color="@color/info_banner_padded_background_color">
    
    6
    +    <item
    
    7
    +        android:bottom="6dp"
    
    8
    +        android:top="6dp">
    
    9
    +        <shape android:shape="rectangle">
    
    10
    +            <corners android:radius="4dp" />
    
    11
    +        </shape>
    
    12
    +    </item>
    
    13
    +</ripple>

  • app/src/main/res/drawable/tor_banner_warning_icon.png
    No preview for this file type
  • app/src/main/res/layout/fragment_home.xml
    ... ... @@ -94,7 +94,8 @@
    94 94
                 android:textColor="#DEFFFFFF"
    
    95 95
                 android:textSize="40sp"
    
    96 96
                 android:lineSpacingMultiplier="1.1"
    
    97
    -            app:layout_scrollFlags="scroll" />
    
    97
    +            app:layout_scrollFlags="scroll"
    
    98
    +            android:visibility="gone" />
    
    98 99
     
    
    99 100
         </com.google.android.material.appbar.AppBarLayout>
    
    100 101
     
    

  • app/src/main/res/layout/tor_info_banner.xml
    1
    +<?xml version="1.0" encoding="utf-8"?>
    
    2
    +<!-- This Source Code Form is subject to the terms of the Mozilla Public
    
    3
    +   - License, v. 2.0. If a copy of the MPL was not distributed with this
    
    4
    +   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    
    5
    +<androidx.constraintlayout.widget.ConstraintLayout
    
    6
    +    xmlns:android="http://schemas.android.com/apk/res/android"
    
    7
    +    xmlns:app="http://schemas.android.com/apk/res-auto"
    
    8
    +    android:id="@+id/info_banner_wrapper"
    
    9
    +    style="@style/OnboardingCardLightWithPadding"
    
    10
    +    android:layout_width="match_parent"
    
    11
    +    android:layout_height="wrap_content"
    
    12
    +    android:clipChildren="false"
    
    13
    +    android:clipToPadding="false">
    
    14
    +
    
    15
    +    <LinearLayout
    
    16
    +        android:id="@+id/info_banner_header_wrapper"
    
    17
    +        android:layout_width="match_parent"
    
    18
    +        android:layout_height="wrap_content"
    
    19
    +        app:layout_constraintStart_toStartOf="parent"
    
    20
    +        app:layout_constraintTop_toTopOf="parent"
    
    21
    +        android:importantForAccessibility="no">
    
    22
    +
    
    23
    +        <ImageView
    
    24
    +            android:id="@+id/tor_info_banner_icon"
    
    25
    +            android:layout_width="wrap_content"
    
    26
    +            android:layout_height="32dp"
    
    27
    +            android:layout_marginEnd="10dp"
    
    28
    +            android:adjustViewBounds="true"
    
    29
    +            android:clickable="false"
    
    30
    +            android:focusable="false"
    
    31
    +            android:importantForAccessibility="no"
    
    32
    +            app:srcCompat="@drawable/tor_banner_warning_icon"/>
    
    33
    +
    
    34
    +        <TextView
    
    35
    +            android:id="@+id/info_banner_header"
    
    36
    +            android:layout_width="match_parent"
    
    37
    +            android:layout_height="wrap_content"
    
    38
    +            android:ellipsize="none"
    
    39
    +            android:lineSpacingExtra="6dp"
    
    40
    +            android:paddingHorizontal="4dp"
    
    41
    +            android:paddingTop="4dp"
    
    42
    +            android:scrollHorizontally="false"
    
    43
    +            android:textAlignment="viewStart"
    
    44
    +            android:textColor="?primaryText"
    
    45
    +            android:textSize="20sp"
    
    46
    +            android:text="" />
    
    47
    +    </LinearLayout>
    
    48
    +
    
    49
    +    <TextView
    
    50
    +        android:id="@+id/info_banner_description"
    
    51
    +        android:layout_width="match_parent"
    
    52
    +        android:layout_height="wrap_content"
    
    53
    +        android:ellipsize="none"
    
    54
    +        android:lineSpacingExtra="6dp"
    
    55
    +        android:paddingHorizontal="4dp"
    
    56
    +        android:paddingTop="4dp"
    
    57
    +        app:layout_constraintEnd_toEndOf="parent"
    
    58
    +        app:layout_constraintStart_toStartOf="parent"
    
    59
    +        app:layout_constraintTop_toBottomOf="@id/info_banner_header_wrapper"
    
    60
    +        android:scrollHorizontally="false"
    
    61
    +        android:textAlignment="viewStart"
    
    62
    +        android:textColor="?primaryText"
    
    63
    +        android:textSize="16sp"
    
    64
    +        android:text="Tor is ending its support for version 2 (v2) Onion Services, and v2 onion sites have since been deprecated. If you're a site administrator, upgrade to a v3 onion service immediately." />
    
    65
    +
    
    66
    +    <Button
    
    67
    +        style="@style/PositiveButton"
    
    68
    +        android:id="@+id/info_banner_launch_button"
    
    69
    +        android:text="Learn More"
    
    70
    +        android:layout_marginTop="16dp"
    
    71
    +        android:textSize="18dp"
    
    72
    +        android:textColor="@android:color/black"
    
    73
    +        android:background="">"@drawable/info_banner_padded_background"
    
    74
    +        android:fontFamily="Roboto-Medium"
    
    75
    +        app:layout_constraintEnd_toEndOf="parent"
    
    76
    +        app:layout_constraintStart_toStartOf="parent"
    
    77
    +        app:layout_constraintTop_toBottomOf="@id/info_banner_description" />
    
    78
    +
    
    79
    +</androidx.constraintlayout.widget.ConstraintLayout>

  • app/src/main/res/values/colors.xml
    ... ... @@ -425,4 +425,7 @@
    425 425
     
    
    426 426
         <!-- Toolbar menu icon colors -->
    
    427 427
         <color name="toolbar_menu_transparent">@android:color/transparent</color>
    
    428
    +
    
    429
    +    <!-- Tor -->
    
    430
    +    <color name="info_banner_padded_background_color">#A76FFA</color>
    
    428 431
     </resources>

  • _______________________________________________
    tor-commits mailing list
    tor-commits@xxxxxxxxxxxxxxxxxxxx
    https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits