From cf27d091f374be9bfe10efe36b98e4f3fecd87ad Mon Sep 17 00:00:00 2001
From: pubiqq <serj.ese@gmail.com>
Date: Thu, 24 Oct 2024 22:05:59 +0300
Subject: [PATCH] chore: update tlds

---
 .../ExcludePackageWithTLDNames.java           |   14 +-
 .../jadx/core/deobf/conditions/tld_3.txt      |  469 ------
 .../jadx/core/deobf/conditions/tlds.txt       | 1452 +++++++++++++++++
 3 files changed, 1458 insertions(+), 477 deletions(-)
 delete mode 100644 jadx-core/src/main/resources/jadx/core/deobf/conditions/tld_3.txt
 create mode 100644 jadx-core/src/main/resources/jadx/core/deobf/conditions/tlds.txt

diff --git a/jadx-core/src/main/java/jadx/core/deobf/conditions/ExcludePackageWithTLDNames.java b/jadx-core/src/main/java/jadx/core/deobf/conditions/ExcludePackageWithTLDNames.java
index 62a755bb332..d19e6745f77 100644
--- a/jadx-core/src/main/java/jadx/core/deobf/conditions/ExcludePackageWithTLDNames.java
+++ b/jadx-core/src/main/java/jadx/core/deobf/conditions/ExcludePackageWithTLDNames.java
@@ -9,8 +9,7 @@
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
 /**
- * Provides a list of all top level domains with 3 characters and less,
- * so we can exclude them from deobfuscation.
+ * Provides a list of all top level domains, so we can exclude them from deobfuscation.
  */
 public class ExcludePackageWithTLDNames extends AbstractDeobfCondition {
 
@@ -18,23 +17,22 @@ public class ExcludePackageWithTLDNames extends AbstractDeobfCondition {
 	 * Lazy load TLD set
 	 */
 	private static class TldHolder {
-		private static final Set<String> TLD_SET = loadTldFile();
+		private static final Set<String> TLD_SET = loadTldSet();
 	}
 
-	private static Set<String> loadTldFile() {
-		try (BufferedReader reader = new BufferedReader(new InputStreamReader(TldHolder.class.getResourceAsStream("tld_3.txt")))) {
+	private static Set<String> loadTldSet() {
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(TldHolder.class.getResourceAsStream("tlds.txt")))) {
 			return reader.lines()
-					.map(String::trim)
 					.filter(line -> !line.startsWith("#") && !line.isEmpty())
 					.collect(Collectors.toSet());
 		} catch (Exception e) {
-			throw new JadxRuntimeException("Failed to load top level domain list file: tld_3.txt", e);
+			throw new JadxRuntimeException("Failed to load top level domain list file: tlds.txt", e);
 		}
 	}
 
 	@Override
 	public Action check(PackageNode pkg) {
-		if (TldHolder.TLD_SET.contains(pkg.getName())) {
+		if (pkg.isRoot() && TldHolder.TLD_SET.contains(pkg.getName())) {
 			return Action.FORBID_RENAME;
 		}
 		return Action.NO_ACTION;
diff --git a/jadx-core/src/main/resources/jadx/core/deobf/conditions/tld_3.txt b/jadx-core/src/main/resources/jadx/core/deobf/conditions/tld_3.txt
deleted file mode 100644
index 28fdf6eea54..00000000000
--- a/jadx-core/src/main/resources/jadx/core/deobf/conditions/tld_3.txt
+++ /dev/null
@@ -1,469 +0,0 @@
-# All tld domains with 3 or less characters
-# Created from https://data.iana.org/TLD/tlds-alpha-by-domain.txt version 2022020500
-aaa
-abb
-abc
-ac
-aco
-ad
-ads
-ae
-aeg
-af
-afl
-ag
-ai
-aig
-al
-am
-anz
-ao
-aol
-app
-aq
-ar
-art
-as
-at
-au
-aw
-aws
-ax
-axa
-az
-ba
-bar
-bb
-bbc
-bbt
-bcg
-bcn
-bd
-be
-bet
-bf
-bg
-bh
-bi
-bid
-bio
-biz
-bj
-bm
-bms
-bmw
-bn
-bo
-bom
-boo
-bot
-box
-br
-bs
-bt
-buy
-bv
-bw
-by
-bz
-bzh
-ca
-cab
-cal
-cam
-car
-cat
-cba
-cbn
-cbs
-cc
-cd
-ceo
-cf
-cfa
-cfd
-cg
-ch
-ci
-ck
-cl
-cm
-cn
-co
-com
-cpa
-cr
-crs
-cu
-cv
-cw
-cx
-cy
-cz
-dad
-day
-dds
-de
-dev
-dhl
-diy
-dj
-dk
-dm
-dnp
-do
-dog
-dot
-dtv
-dvr
-dz
-eat
-ec
-eco
-edu
-ee
-eg
-er
-es
-esq
-et
-eu
-eus
-fan
-fi
-fit
-fj
-fk
-fly
-fm
-fo
-foo
-fox
-fr
-frl
-ftr
-fun
-fyi
-ga
-gal
-gap
-gay
-gb
-gd
-gdn
-ge
-gea
-gf
-gg
-gh
-gi
-gl
-gle
-gm
-gmo
-gmx
-gn
-goo
-gop
-got
-gov
-gp
-gq
-gr
-gs
-gt
-gu
-gw
-gy
-hbo
-hiv
-hk
-hkt
-hm
-hn
-hot
-how
-hr
-ht
-hu
-ibm
-ice
-icu
-id
-ie
-ifm
-il
-im
-in
-inc
-ing
-ink
-int
-io
-iq
-ir
-is
-ist
-it
-itv
-jcb
-je
-jio
-jll
-jm
-jmp
-jnj
-jo
-jot
-joy
-jp
-ke
-kfh
-kg
-kh
-ki
-kia
-kim
-km
-kn
-kp
-kpn
-kr
-krd
-kw
-ky
-kz
-la
-lat
-law
-lb
-lc
-lds
-li
-lk
-llc
-llp
-lol
-lpl
-lr
-ls
-lt
-ltd
-lu
-lv
-ly
-ma
-man
-map
-mba
-mc
-md
-me
-med
-men
-mg
-mh
-mil
-mit
-mk
-ml
-mlb
-mls
-mm
-mma
-mn
-mo
-moe
-moi
-mom
-mov
-mp
-mq
-mr
-ms
-msd
-mt
-mtn
-mtr
-mu
-mv
-mw
-mx
-my
-mz
-na
-nab
-nba
-nc
-ne
-nec
-net
-new
-nf
-nfl
-ng
-ngo
-nhk
-ni
-nl
-no
-now
-np
-nr
-nra
-nrw
-ntt
-nu
-nyc
-nz
-obi
-om
-one
-ong
-onl
-ooo
-org
-ott
-ovh
-pa
-pay
-pe
-pet
-pf
-pg
-ph
-phd
-pid
-pin
-pk
-pl
-pm
-pn
-pnc
-pr
-pro
-pru
-ps
-pt
-pub
-pw
-pwc
-py
-qa
-re
-red
-ren
-ril
-rio
-rip
-ro
-rs
-ru
-run
-rw
-rwe
-sa
-sap
-sas
-sb
-sbi
-sbs
-sc
-sca
-scb
-sd
-se
-ses
-sew
-sex
-sfr
-sg
-sh
-si
-sj
-sk
-ski
-sky
-sl
-sm
-sn
-so
-soy
-spa
-sr
-srl
-ss
-st
-stc
-su
-sv
-sx
-sy
-sz
-tab
-tax
-tc
-tci
-td
-tdk
-tel
-tf
-tg
-th
-thd
-tj
-tjx
-tk
-tl
-tm
-tn
-to
-top
-tr
-trv
-tt
-tui
-tv
-tvs
-tw
-tz
-ua
-ubs
-ug
-uk
-uno
-uol
-ups
-us
-uy
-uz
-va
-vc
-ve
-vet
-vg
-vi
-vig
-vin
-vip
-vn
-vu
-wed
-wf
-win
-wme
-wow
-ws
-wtc
-wtf
-xin
-xxx
-xyz
-ye
-you
-yt
-yun
-za
-zip
-zm
-zw
diff --git a/jadx-core/src/main/resources/jadx/core/deobf/conditions/tlds.txt b/jadx-core/src/main/resources/jadx/core/deobf/conditions/tlds.txt
new file mode 100644
index 00000000000..f35cae09f66
--- /dev/null
+++ b/jadx-core/src/main/resources/jadx/core/deobf/conditions/tlds.txt
@@ -0,0 +1,1452 @@
+# All tld domains
+# Source: https://data.iana.org/TLD/tlds-alpha-by-domain.txt
+# Version 2024102400, Last Updated Thu Oct 24 07:07:01 2024 UTC
+
+# ASCII domains
+aaa
+aarp
+abb
+abbott
+abbvie
+abc
+able
+abogado
+abudhabi
+ac
+academy
+accenture
+accountant
+accountants
+aco
+actor
+ad
+ads
+adult
+ae
+aeg
+aero
+aetna
+af
+afl
+africa
+ag
+agakhan
+agency
+ai
+aig
+airbus
+airforce
+airtel
+akdn
+al
+alibaba
+alipay
+allfinanz
+allstate
+ally
+alsace
+alstom
+am
+amazon
+americanexpress
+americanfamily
+amex
+amfam
+amica
+amsterdam
+analytics
+android
+anquan
+anz
+ao
+aol
+apartments
+app
+apple
+aq
+aquarelle
+ar
+arab
+aramco
+archi
+army
+arpa
+art
+arte
+as
+asda
+asia
+associates
+at
+athleta
+attorney
+au
+auction
+audi
+audible
+audio
+auspost
+author
+auto
+autos
+aw
+aws
+ax
+axa
+az
+azure
+ba
+baby
+baidu
+banamex
+band
+bank
+bar
+barcelona
+barclaycard
+barclays
+barefoot
+bargains
+baseball
+basketball
+bauhaus
+bayern
+bb
+bbc
+bbt
+bbva
+bcg
+bcn
+bd
+be
+beats
+beauty
+beer
+bentley
+berlin
+best
+bestbuy
+bet
+bf
+bg
+bh
+bharti
+bi
+bible
+bid
+bike
+bing
+bingo
+bio
+biz
+bj
+black
+blackfriday
+blockbuster
+blog
+bloomberg
+blue
+bm
+bms
+bmw
+bn
+bnpparibas
+bo
+boats
+boehringer
+bofa
+bom
+bond
+boo
+book
+booking
+bosch
+bostik
+boston
+bot
+boutique
+box
+br
+bradesco
+bridgestone
+broadway
+broker
+brother
+brussels
+bs
+bt
+build
+builders
+business
+buy
+buzz
+bv
+bw
+by
+bz
+bzh
+ca
+cab
+cafe
+cal
+call
+calvinklein
+cam
+camera
+camp
+canon
+capetown
+capital
+capitalone
+car
+caravan
+cards
+care
+career
+careers
+cars
+casa
+case
+cash
+casino
+cat
+catering
+catholic
+cba
+cbn
+cbre
+cc
+cd
+center
+ceo
+cern
+cf
+cfa
+cfd
+cg
+ch
+chanel
+channel
+charity
+chase
+chat
+cheap
+chintai
+christmas
+chrome
+church
+ci
+cipriani
+circle
+cisco
+citadel
+citi
+citic
+city
+ck
+cl
+claims
+cleaning
+click
+clinic
+clinique
+clothing
+cloud
+club
+clubmed
+cm
+cn
+co
+coach
+codes
+coffee
+college
+cologne
+com
+commbank
+community
+company
+compare
+computer
+comsec
+condos
+construction
+consulting
+contact
+contractors
+cooking
+cool
+coop
+corsica
+country
+coupon
+coupons
+courses
+cpa
+cr
+credit
+creditcard
+creditunion
+cricket
+crown
+crs
+cruise
+cruises
+cu
+cuisinella
+cv
+cw
+cx
+cy
+cymru
+cyou
+cz
+dad
+dance
+data
+date
+dating
+datsun
+day
+dclk
+dds
+de
+deal
+dealer
+deals
+degree
+delivery
+dell
+deloitte
+delta
+democrat
+dental
+dentist
+desi
+design
+dev
+dhl
+diamonds
+diet
+digital
+direct
+directory
+discount
+discover
+dish
+diy
+dj
+dk
+dm
+dnp
+do
+docs
+doctor
+dog
+domains
+dot
+download
+drive
+dtv
+dubai
+dunlop
+dupont
+durban
+dvag
+dvr
+dz
+earth
+eat
+ec
+eco
+edeka
+edu
+education
+ee
+eg
+email
+emerck
+energy
+engineer
+engineering
+enterprises
+epson
+equipment
+er
+ericsson
+erni
+es
+esq
+estate
+et
+eu
+eurovision
+eus
+events
+exchange
+expert
+exposed
+express
+extraspace
+fage
+fail
+fairwinds
+faith
+family
+fan
+fans
+farm
+farmers
+fashion
+fast
+fedex
+feedback
+ferrari
+ferrero
+fi
+fidelity
+fido
+film
+final
+finance
+financial
+fire
+firestone
+firmdale
+fish
+fishing
+fit
+fitness
+fj
+fk
+flickr
+flights
+flir
+florist
+flowers
+fly
+fm
+fo
+foo
+food
+football
+ford
+forex
+forsale
+forum
+foundation
+fox
+fr
+free
+fresenius
+frl
+frogans
+frontier
+ftr
+fujitsu
+fun
+fund
+furniture
+futbol
+fyi
+ga
+gal
+gallery
+gallo
+gallup
+game
+games
+gap
+garden
+gay
+gb
+gbiz
+gd
+gdn
+ge
+gea
+gent
+genting
+george
+gf
+gg
+ggee
+gh
+gi
+gift
+gifts
+gives
+giving
+gl
+glass
+gle
+global
+globo
+gm
+gmail
+gmbh
+gmo
+gmx
+gn
+godaddy
+gold
+goldpoint
+golf
+goo
+goodyear
+goog
+google
+gop
+got
+gov
+gp
+gq
+gr
+grainger
+graphics
+gratis
+green
+gripe
+grocery
+group
+gs
+gt
+gu
+gucci
+guge
+guide
+guitars
+guru
+gw
+gy
+hair
+hamburg
+hangout
+haus
+hbo
+hdfc
+hdfcbank
+health
+healthcare
+help
+helsinki
+here
+hermes
+hiphop
+hisamitsu
+hitachi
+hiv
+hk
+hkt
+hm
+hn
+hockey
+holdings
+holiday
+homedepot
+homegoods
+homes
+homesense
+honda
+horse
+hospital
+host
+hosting
+hot
+hotels
+hotmail
+house
+how
+hr
+hsbc
+ht
+hu
+hughes
+hyatt
+hyundai
+ibm
+icbc
+ice
+icu
+id
+ie
+ieee
+ifm
+ikano
+il
+im
+imamat
+imdb
+immo
+immobilien
+in
+inc
+industries
+infiniti
+info
+ing
+ink
+institute
+insurance
+insure
+int
+international
+intuit
+investments
+io
+ipiranga
+iq
+ir
+irish
+is
+ismaili
+ist
+istanbul
+it
+itau
+itv
+jaguar
+java
+jcb
+je
+jeep
+jetzt
+jewelry
+jio
+jll
+jm
+jmp
+jnj
+jo
+jobs
+joburg
+jot
+joy
+jp
+jpmorgan
+jprs
+juegos
+juniper
+kaufen
+kddi
+ke
+kerryhotels
+kerrylogistics
+kerryproperties
+kfh
+kg
+kh
+ki
+kia
+kids
+kim
+kindle
+kitchen
+kiwi
+km
+kn
+koeln
+komatsu
+kosher
+kp
+kpmg
+kpn
+kr
+krd
+kred
+kuokgroup
+kw
+ky
+kyoto
+kz
+la
+lacaixa
+lamborghini
+lamer
+lancaster
+land
+landrover
+lanxess
+lasalle
+lat
+latino
+latrobe
+law
+lawyer
+lb
+lc
+lds
+lease
+leclerc
+lefrak
+legal
+lego
+lexus
+lgbt
+li
+lidl
+life
+lifeinsurance
+lifestyle
+lighting
+like
+lilly
+limited
+limo
+lincoln
+link
+lipsy
+live
+living
+lk
+llc
+llp
+loan
+loans
+locker
+locus
+lol
+london
+lotte
+lotto
+love
+lpl
+lplfinancial
+lr
+ls
+lt
+ltd
+ltda
+lu
+lundbeck
+luxe
+luxury
+lv
+ly
+ma
+madrid
+maif
+maison
+makeup
+man
+management
+mango
+map
+market
+marketing
+markets
+marriott
+marshalls
+mattel
+mba
+mc
+mckinsey
+md
+me
+med
+media
+meet
+melbourne
+meme
+memorial
+men
+menu
+merckmsd
+mg
+mh
+miami
+microsoft
+mil
+mini
+mint
+mit
+mitsubishi
+mk
+ml
+mlb
+mls
+mm
+mma
+mn
+mo
+mobi
+mobile
+moda
+moe
+moi
+mom
+monash
+money
+monster
+mormon
+mortgage
+moscow
+moto
+motorcycles
+mov
+movie
+mp
+mq
+mr
+ms
+msd
+mt
+mtn
+mtr
+mu
+museum
+music
+mv
+mw
+mx
+my
+mz
+na
+nab
+nagoya
+name
+navy
+nba
+nc
+ne
+nec
+net
+netbank
+netflix
+network
+neustar
+new
+news
+next
+nextdirect
+nexus
+nf
+nfl
+ng
+ngo
+nhk
+ni
+nico
+nike
+nikon
+ninja
+nissan
+nissay
+nl
+no
+nokia
+norton
+now
+nowruz
+nowtv
+np
+nr
+nra
+nrw
+ntt
+nu
+nyc
+nz
+obi
+observer
+office
+okinawa
+olayan
+olayangroup
+ollo
+om
+omega
+one
+ong
+onl
+online
+ooo
+open
+oracle
+orange
+org
+organic
+origins
+osaka
+otsuka
+ott
+ovh
+pa
+page
+panasonic
+paris
+pars
+partners
+parts
+party
+pay
+pccw
+pe
+pet
+pf
+pfizer
+pg
+ph
+pharmacy
+phd
+philips
+phone
+photo
+photography
+photos
+physio
+pics
+pictet
+pictures
+pid
+pin
+ping
+pink
+pioneer
+pizza
+pk
+pl
+place
+play
+playstation
+plumbing
+plus
+pm
+pn
+pnc
+pohl
+poker
+politie
+porn
+post
+pr
+pramerica
+praxi
+press
+prime
+pro
+prod
+productions
+prof
+progressive
+promo
+properties
+property
+protection
+pru
+prudential
+ps
+pt
+pub
+pw
+pwc
+py
+qa
+qpon
+quebec
+quest
+racing
+radio
+re
+read
+realestate
+realtor
+realty
+recipes
+red
+redstone
+redumbrella
+rehab
+reise
+reisen
+reit
+reliance
+ren
+rent
+rentals
+repair
+report
+republican
+rest
+restaurant
+review
+reviews
+rexroth
+rich
+richardli
+ricoh
+ril
+rio
+rip
+ro
+rocks
+rodeo
+rogers
+room
+rs
+rsvp
+ru
+rugby
+ruhr
+run
+rw
+rwe
+ryukyu
+sa
+saarland
+safe
+safety
+sakura
+sale
+salon
+samsclub
+samsung
+sandvik
+sandvikcoromant
+sanofi
+sap
+sarl
+sas
+save
+saxo
+sb
+sbi
+sbs
+sc
+scb
+schaeffler
+schmidt
+scholarships
+school
+schule
+schwarz
+science
+scot
+sd
+se
+search
+seat
+secure
+security
+seek
+select
+sener
+services
+seven
+sew
+sex
+sexy
+sfr
+sg
+sh
+shangrila
+sharp
+shell
+shia
+shiksha
+shoes
+shop
+shopping
+shouji
+show
+si
+silk
+sina
+singles
+site
+sj
+sk
+ski
+skin
+sky
+skype
+sl
+sling
+sm
+smart
+smile
+sn
+sncf
+so
+soccer
+social
+softbank
+software
+sohu
+solar
+solutions
+song
+sony
+soy
+spa
+space
+sport
+spot
+sr
+srl
+ss
+st
+stada
+staples
+star
+statebank
+statefarm
+stc
+stcgroup
+stockholm
+storage
+store
+stream
+studio
+study
+style
+su
+sucks
+supplies
+supply
+support
+surf
+surgery
+suzuki
+sv
+swatch
+swiss
+sx
+sy
+sydney
+systems
+sz
+tab
+taipei
+talk
+taobao
+target
+tatamotors
+tatar
+tattoo
+tax
+taxi
+tc
+tci
+td
+tdk
+team
+tech
+technology
+tel
+temasek
+tennis
+teva
+tf
+tg
+th
+thd
+theater
+theatre
+tiaa
+tickets
+tienda
+tips
+tires
+tirol
+tj
+tjmaxx
+tjx
+tk
+tkmaxx
+tl
+tm
+tmall
+tn
+to
+today
+tokyo
+tools
+top
+toray
+toshiba
+total
+tours
+town
+toyota
+toys
+tr
+trade
+trading
+training
+travel
+travelers
+travelersinsurance
+trust
+trv
+tt
+tube
+tui
+tunes
+tushu
+tv
+tvs
+tw
+tz
+ua
+ubank
+ubs
+ug
+uk
+unicom
+university
+uno
+uol
+ups
+us
+uy
+uz
+va
+vacations
+vana
+vanguard
+vc
+ve
+vegas
+ventures
+verisign
+versicherung
+vet
+vg
+vi
+viajes
+video
+vig
+viking
+villas
+vin
+vip
+virgin
+visa
+vision
+viva
+vivo
+vlaanderen
+vn
+vodka
+volvo
+vote
+voting
+voto
+voyage
+vu
+wales
+walmart
+walter
+wang
+wanggou
+watch
+watches
+weather
+weatherchannel
+webcam
+weber
+website
+wed
+wedding
+weibo
+weir
+wf
+whoswho
+wien
+wiki
+williamhill
+win
+windows
+wine
+winners
+wme
+wolterskluwer
+woodside
+work
+works
+world
+wow
+ws
+wtc
+wtf
+xbox
+xerox
+xihuan
+xin
+xxx
+xyz
+yachts
+yahoo
+yamaxun
+yandex
+ye
+yodobashi
+yoga
+yokohama
+you
+youtube
+yt
+yun
+za
+zappos
+zara
+zero
+zip
+zm
+zone
+zuerich
+zw
+
+# Non-ASCII domains
+कॉम
+セール
+佛山
+ಭಾರತ
+慈善
+集团
+在线
+한국
+ଭାରତ
+点看
+คอม
+ভাৰত
+ভারত
+八卦
+ישראל
+موقع
+বাংলা
+公益
+公司
+香格里拉
+网站
+移动
+我爱你
+москва
+қаз
+католик
+онлайн
+сайт
+联通
+срб
+бг
+бел
+קום
+时尚
+微博
+淡马锡
+ファッション
+орг
+नेट
+ストア
+アマゾン
+삼성
+சிங்கப்பூர்
+商标
+商店
+商城
+дети
+мкд
+ею
+ポイント
+新闻
+家電
+كوم
+中文网
+中信
+中国
+中國
+娱乐
+谷歌
+భారత్
+ලංකා
+電訊盈科
+购物
+クラウド
+ભારત
+通販
+भारतम्
+भारत
+भारोत
+网店
+संगठन
+餐厅
+网络
+ком
+укр
+香港
+亚马逊
+食品
+飞利浦
+台湾
+台灣
+手机
+мон
+الجزائر
+عمان
+ارامكو
+ایران
+العليان
+امارات
+بازار
+موريتانيا
+پاکستان
+الاردن
+بارت
+بھارت
+المغرب
+ابوظبي
+البحرين
+السعودية
+ڀارت
+كاثوليك
+سودان
+همراه
+عراق
+مليسيا
+澳門
+닷컴
+政府
+شبكة
+بيتك
+عرب
+გე
+机构
+组织机构
+健康
+ไทย
+سورية
+招聘
+рус
+рф
+تونس
+大拿
+ລາວ
+みんな
+グーグル
+ευ
+ελ
+世界
+書籍
+ഭാരതം
+ਭਾਰਤ
+网址
+닷넷
+コム
+天主教
+游戏
+vermögensberater
+vermögensberatung
+企业
+信息
+嘉里大酒店
+嘉里
+مصر
+قطر
+广东
+இலங்கை
+இந்தியா
+հայ
+新加坡
+فلسطين
+政务