Last active
September 12, 2018 11:27
-
-
Save blunden/aaaa3e78bb522c48dd7dad0a557b970b to your computer and use it in GitHub Desktop.
[PATCH] Address crashes on Android TV
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From d5fb8ad828ec497b9c1226fa6f3087a7317c4235 Mon Sep 17 00:00:00 2001 | |
From: blunden <CENSORED> | |
Date: Thu, 7 Jun 2018 01:50:59 +0200 | |
Subject: [PATCH] Revert network security config changes that were likely not | |
needed | |
These were part of an earlier attempt to fix the untrusted | |
certificate issue without self-hosting the file. | |
--- | |
res/raw/sonera_class2_ca.pem | 19 ------------------- | |
res/raw/telia_root_ca_v1.pem | 30 ----------------------------- | |
res/raw/telia_server_ca_v2.pem | 30 ----------------------------- | |
res/raw/tve_config_han_telia_se.pem | 38 ------------------------------------- | |
res/xml/dbg_net_security_config.xml | 11 +++-------- | |
5 files changed, 3 insertions(+), 125 deletions(-) | |
delete mode 100644 res/raw/sonera_class2_ca.pem | |
delete mode 100644 res/raw/telia_root_ca_v1.pem | |
delete mode 100644 res/raw/telia_server_ca_v2.pem | |
delete mode 100644 res/raw/tve_config_han_telia_se.pem | |
diff --git a/res/raw/sonera_class2_ca.pem b/res/raw/sonera_class2_ca.pem | |
deleted file mode 100644 | |
index 36a998d..0000000 | |
--- a/res/raw/sonera_class2_ca.pem | |
+++ /dev/null | |
@@ -1,19 +0,0 @@ | |
------BEGIN CERTIFICATE----- | |
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP | |
-MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx | |
-MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV | |
-BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI | |
-hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o | |
-Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt | |
-5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s | |
-3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej | |
-vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu | |
-8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw | |
-DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG | |
-MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil | |
-zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/ | |
-3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD | |
-FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6 | |
-Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2 | |
-ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M | |
------END CERTIFICATE----- | |
diff --git a/res/raw/telia_root_ca_v1.pem b/res/raw/telia_root_ca_v1.pem | |
deleted file mode 100644 | |
index 8bc52c3..0000000 | |
--- a/res/raw/telia_root_ca_v1.pem | |
+++ /dev/null | |
@@ -1,30 +0,0 @@ | |
------BEGIN CERTIFICATE----- | |
-MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAw | |
-NzEUMBIGA1UECgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJv | |
-b3QgQ0EgdjEwHhcNMDcxMDE4MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYD | |
-VQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwWVGVsaWFTb25lcmEgUm9vdCBDQSB2 | |
-MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+6yfwIaPzaSZVfp3F | |
-VRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA3GV1 | |
-7CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+X | |
-Z75Ljo1kB1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+ | |
-/jXh7VB7qTCNGdMJjmhnXb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs | |
-81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxHoLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkm | |
-dtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3F0fUTPHSiXk+TT2YqGHe | |
-Oh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJoWjiUIMu | |
-sDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4 | |
-pgd7gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fs | |
-slESl1MpWtTwEhDcTwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQ | |
-arMCpgKIv7NHfirZ1fpoeDVNAgMBAAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYD | |
-VR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qWDNXr+nuqF+gTEjANBgkqhkiG | |
-9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNmzqjMDfz1mgbl | |
-dxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx | |
-0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1Tj | |
-TQpgcmLNkQfWpb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBed | |
-Y2gea+zDTYa4EzAvXUYNR0PVG6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7 | |
-Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpcc41teyWRyu5FrgZLAMzTsVlQ2jqI | |
-OylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOTJsjrDNYmiLbAJM+7 | |
-vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2qReW | |
-t88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcn | |
-HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx | |
-SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY= | |
------END CERTIFICATE----- | |
diff --git a/res/raw/telia_server_ca_v2.pem b/res/raw/telia_server_ca_v2.pem | |
deleted file mode 100644 | |
index 8bc52c3..0000000 | |
--- a/res/raw/telia_server_ca_v2.pem | |
+++ /dev/null | |
@@ -1,30 +0,0 @@ | |
------BEGIN CERTIFICATE----- | |
-MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAw | |
-NzEUMBIGA1UECgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJv | |
-b3QgQ0EgdjEwHhcNMDcxMDE4MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYD | |
-VQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwWVGVsaWFTb25lcmEgUm9vdCBDQSB2 | |
-MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+6yfwIaPzaSZVfp3F | |
-VRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA3GV1 | |
-7CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+X | |
-Z75Ljo1kB1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+ | |
-/jXh7VB7qTCNGdMJjmhnXb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs | |
-81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxHoLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkm | |
-dtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3F0fUTPHSiXk+TT2YqGHe | |
-Oh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJoWjiUIMu | |
-sDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4 | |
-pgd7gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fs | |
-slESl1MpWtTwEhDcTwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQ | |
-arMCpgKIv7NHfirZ1fpoeDVNAgMBAAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYD | |
-VR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qWDNXr+nuqF+gTEjANBgkqhkiG | |
-9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNmzqjMDfz1mgbl | |
-dxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx | |
-0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1Tj | |
-TQpgcmLNkQfWpb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBed | |
-Y2gea+zDTYa4EzAvXUYNR0PVG6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7 | |
-Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpcc41teyWRyu5FrgZLAMzTsVlQ2jqI | |
-OylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOTJsjrDNYmiLbAJM+7 | |
-vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2qReW | |
-t88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcn | |
-HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx | |
-SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY= | |
------END CERTIFICATE----- | |
diff --git a/res/raw/tve_config_han_telia_se.pem b/res/raw/tve_config_han_telia_se.pem | |
deleted file mode 100644 | |
index 18efbfb..0000000 | |
--- a/res/raw/tve_config_han_telia_se.pem | |
+++ /dev/null | |
@@ -1,38 +0,0 @@ | |
------BEGIN CERTIFICATE----- | |
-MIIGnzCCBIegAwIBAgIRAJ/q6SKDNAqllw+oTm2FX1IwDQYJKoZIhvcNAQELBQAw | |
-RjELMAkGA1UEBhMCRkkxFDASBgNVBAoMC1RlbGlhU29uZXJhMSEwHwYDVQQDDBhU | |
-ZWxpYVNvbmVyYSBTZXJ2ZXIgQ0EgdjIwHhcNMTYxMTExMTA1MDU2WhcNMTkxMTEx | |
-MTA1MDU2WjCBgTELMAkGA1UEBhMCU0UxDjAMBgNVBAgMBVNvbG5hMQ4wDAYDVQQH | |
-DAVTb2xuYTEZMBcGA1UECgwQVGVsaWEgQ29tcGFueSBBQjEVMBMGA1UECwwMVFZP | |
-cHMgQ29tbW9uMSAwHgYDVQQDDBd0dmUtY29uZmlnLmhhbi50ZWxpYS5zZTCCASIw | |
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMlYsriQup/h+ibhxYWnBCKBUNPK | |
-0WCqfaZPUo5RFtDDfFlkee6O5cyJgGgb7N17cf24BkgZD3p437KZU53K4m/g9Soi | |
-aNY938tSZcsFKtX+SAlOtXXv28zNsW+GwRlh+Mj/OCt49fd5IVKSSAnj1sNFMCNz | |
-V6NY5n3bCPWR6lisp7b2pdn4fnfiyhrkT/Js+Dnk25u/TrKq7x9JrLyhmicVo6Ep | |
-WlNK48jcccNFGHRnrINo3qzQJJb60Yi3e5nUP3fqtI+3BBnXPR6fvw238LOcxw58 | |
-L+OtwYTATAyt5FAJPF0zvqKnhwkwshtC3ZVSY6FiHzUhYefXH2kdyXICrUUCAwEA | |
-AaOCAkowggJGMIGNBggrBgEFBQcBAQSBgDB+MC0GCCsGAQUFBzABhiFodHRwOi8v | |
-b2NzcC50cnVzdC50ZWxpYXNvbmVyYS5jb20wTQYIKwYBBQUHMAKGQWh0dHA6Ly9y | |
-ZXBvc2l0b3J5LnRydXN0LnRlbGlhc29uZXJhLmNvbS90ZWxpYXNvbmVyYXNlcnZl | |
-cmNhdjIuY2VyMB8GA1UdIwQYMBaAFC9JPClP1wcl+caM1WT1Zj0SgyKVMFQGA1Ud | |
-IARNMEswSQYMKwYBBAGCDwIDAQEPMDkwNwYIKwYBBQUHAgEWK2h0dHA6Ly9yZXBv | |
-c2l0b3J5LnRydXN0LnRlbGlhc29uZXJhLmNvbS9DUFMwgcoGA1UdHwSBwjCBvzBC | |
-oECgPoY8aHR0cDovL2NybC0zLnRydXN0LnRlbGlhc29uZXJhLmNvbS90ZWxpYXNv | |
-bmVyYXNlcnZlcmNhdjIuY3JsMHmgd6B1hnNsZGFwOi8vY3JsLTEudHJ1c3QudGVs | |
-aWFzb25lcmEuY29tL2NuPVRlbGlhU29uZXJhJTIwU2VydmVyJTIwQ0ElMjB2Mixv | |
-PVRlbGlhU29uZXJhP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q7YmluYXJ5MB0G | |
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBLAwIgYD | |
-VR0RBBswGYIXdHZlLWNvbmZpZy5oYW4udGVsaWEuc2UwHQYDVR0OBBYEFNRDvGpO | |
-CUh2JGj6h0/h/nfvbFGDMA0GCSqGSIb3DQEBCwUAA4ICAQCpMvUWHX315u5lowj7 | |
-lhwjSeT83/i8dOoona+c9p7UE8nZH8+y6uMT2K0ycxqYKu+exZ1r60I6W6iYhcQC | |
-G2Wwrs4ekyXY17gMCWEiB61kL1VHEk96l+Vp8ViGmqwSWNKhzDApD9h8FisPlGw/ | |
-J1wOfOa8dN2KsKn6QF2NFYLw7HSWM6KrR1Uk5eH1pTF5dQcW9k+lEeS1shZyLbcG | |
-2jVv6V4Rz4E+I3ZWO1etQK7OQ6OdyJPh90nTHJKv54+dNkFYSOK9rS9FnJpTJnPt | |
-qDfk20WMq4nIkmTihldhM+cc7BENy4WpWfMFod3/3N9dDhNezDldrjcgY9PFTLsE | |
-O0EgtzPy25yPcug+rbsbHactDfEob+k+LH2czEEQz8vvgfCYDNHDlRkdLnnB02ah | |
-pDLmImNbpxTiRWv38fczSOUQpdDPXVMso3kSMmz4DhoQDQCs+Pt2lyFXoH2opmuz | |
-t4LNm6Q57VDz2LaOIrRTLbJuWJc4mLhpH2c8x8t1q1uVbJQKNc9BDDA/0TI79nTc | |
-cxKiSgK+DzxUI+5+L/nnYWynZBWVhPAgTly7XisoolDu3Pe3V6grfvxpAniadAGh | |
-I4ndudcGnSKRcKF06namjVwlIDLUk8oC8ATZRTqgg2m9gmBV65PhtIZ8C3rKT+Io | |
-NNkY+8GFqETlczDmI3pgDtNw3A== | |
------END CERTIFICATE----- | |
diff --git a/res/xml/dbg_net_security_config.xml b/res/xml/dbg_net_security_config.xml | |
index a31de40..611b0ca 100644 | |
--- a/res/xml/dbg_net_security_config.xml | |
+++ b/res/xml/dbg_net_security_config.xml | |
@@ -1,13 +1,8 @@ | |
<?xml version="1.0" encoding="utf-8"?> | |
<network-security-config> | |
- <base-config> | |
+ <debug-overrides> | |
<trust-anchors> | |
- <certificates src="@raw/tve_config_han_telia_se"/> | |
- <certificates src="@raw/telia_server_ca_v2"/> | |
- <certificates src="@raw/telia_root_ca_v1"/> | |
- <certificates src="@raw/sonera_class2_ca"/> | |
- <certificates src="system"/> | |
- <certificates src="user"/> | |
+ <certificates src="user" /> | |
</trust-anchors> | |
- </base-config> | |
+ </debug-overrides> | |
</network-security-config> | |
\ No newline at end of file | |
-- | |
2.10.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From a628beea6c76bb46cedc331aaabe012bb933b60a Mon Sep 17 00:00:00 2001 | |
From: blunden <CENSORED> | |
Date: Thu, 7 Jun 2018 01:38:35 +0200 | |
Subject: [PATCH] Address crashes on Android TV | |
- Change the host that outputRestrictions.json is fetched from to | |
prevent a crash caused by a lack of trust in the CA issuing the | |
certificate. | |
- Remove calls to casting functionality which doesn't exist on | |
Android TV, causing crashes as a result. | |
--- | |
apktool.yml | 2 +- | |
res/raw/sonera_class2_ca.pem | 19 +++ | |
res/raw/telia_root_ca_v1.pem | 30 ++++ | |
res/raw/telia_server_ca_v2.pem | 30 ++++ | |
res/raw/tve_config_han_telia_se.pem | 38 +++++ | |
res/xml/dbg_net_security_config.xml | 11 +- | |
smali/com/teliasonera/tve/MainActivity.smali | 13 -- | |
smali/com/teliasonera/tve/cast/b.smali | 215 +-------------------------- | |
smali/com/teliasonera/tve/h/c.smali | 2 +- | |
9 files changed, 130 insertions(+), 230 deletions(-) | |
create mode 100644 res/raw/sonera_class2_ca.pem | |
create mode 100644 res/raw/telia_root_ca_v1.pem | |
create mode 100644 res/raw/telia_server_ca_v2.pem | |
create mode 100644 res/raw/tve_config_han_telia_se.pem | |
diff --git a/apktool.yml b/apktool.yml | |
index 9ef4ff9..579b65e 100644 | |
--- a/apktool.yml | |
+++ b/apktool.yml | |
@@ -1,5 +1,5 @@ | |
!!brut.androlib.meta.MetaInfo | |
-apkFileName: Telia_Play_v3.5.0.apk | |
+apkFileName: Telia Play_v3.5.0.apk | |
compressionType: false | |
doNotCompress: | |
- arsc | |
diff --git a/res/raw/sonera_class2_ca.pem b/res/raw/sonera_class2_ca.pem | |
new file mode 100644 | |
index 0000000..36a998d | |
--- /dev/null | |
+++ b/res/raw/sonera_class2_ca.pem | |
@@ -0,0 +1,19 @@ | |
+-----BEGIN CERTIFICATE----- | |
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP | |
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx | |
+MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV | |
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI | |
+hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o | |
+Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt | |
+5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s | |
+3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej | |
+vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu | |
+8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw | |
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG | |
+MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil | |
+zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/ | |
+3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD | |
+FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6 | |
+Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2 | |
+ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M | |
+-----END CERTIFICATE----- | |
diff --git a/res/raw/telia_root_ca_v1.pem b/res/raw/telia_root_ca_v1.pem | |
new file mode 100644 | |
index 0000000..8bc52c3 | |
--- /dev/null | |
+++ b/res/raw/telia_root_ca_v1.pem | |
@@ -0,0 +1,30 @@ | |
+-----BEGIN CERTIFICATE----- | |
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAw | |
+NzEUMBIGA1UECgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJv | |
+b3QgQ0EgdjEwHhcNMDcxMDE4MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYD | |
+VQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwWVGVsaWFTb25lcmEgUm9vdCBDQSB2 | |
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+6yfwIaPzaSZVfp3F | |
+VRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA3GV1 | |
+7CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+X | |
+Z75Ljo1kB1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+ | |
+/jXh7VB7qTCNGdMJjmhnXb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs | |
+81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxHoLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkm | |
+dtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3F0fUTPHSiXk+TT2YqGHe | |
+Oh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJoWjiUIMu | |
+sDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4 | |
+pgd7gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fs | |
+slESl1MpWtTwEhDcTwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQ | |
+arMCpgKIv7NHfirZ1fpoeDVNAgMBAAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYD | |
+VR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qWDNXr+nuqF+gTEjANBgkqhkiG | |
+9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNmzqjMDfz1mgbl | |
+dxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx | |
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1Tj | |
+TQpgcmLNkQfWpb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBed | |
+Y2gea+zDTYa4EzAvXUYNR0PVG6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7 | |
+Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpcc41teyWRyu5FrgZLAMzTsVlQ2jqI | |
+OylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOTJsjrDNYmiLbAJM+7 | |
+vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2qReW | |
+t88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcn | |
+HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx | |
+SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY= | |
+-----END CERTIFICATE----- | |
diff --git a/res/raw/telia_server_ca_v2.pem b/res/raw/telia_server_ca_v2.pem | |
new file mode 100644 | |
index 0000000..8bc52c3 | |
--- /dev/null | |
+++ b/res/raw/telia_server_ca_v2.pem | |
@@ -0,0 +1,30 @@ | |
+-----BEGIN CERTIFICATE----- | |
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAw | |
+NzEUMBIGA1UECgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJv | |
+b3QgQ0EgdjEwHhcNMDcxMDE4MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYD | |
+VQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwWVGVsaWFTb25lcmEgUm9vdCBDQSB2 | |
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+6yfwIaPzaSZVfp3F | |
+VRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA3GV1 | |
+7CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+X | |
+Z75Ljo1kB1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+ | |
+/jXh7VB7qTCNGdMJjmhnXb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs | |
+81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxHoLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkm | |
+dtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3F0fUTPHSiXk+TT2YqGHe | |
+Oh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJoWjiUIMu | |
+sDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4 | |
+pgd7gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fs | |
+slESl1MpWtTwEhDcTwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQ | |
+arMCpgKIv7NHfirZ1fpoeDVNAgMBAAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYD | |
+VR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qWDNXr+nuqF+gTEjANBgkqhkiG | |
+9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNmzqjMDfz1mgbl | |
+dxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx | |
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1Tj | |
+TQpgcmLNkQfWpb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBed | |
+Y2gea+zDTYa4EzAvXUYNR0PVG6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7 | |
+Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpcc41teyWRyu5FrgZLAMzTsVlQ2jqI | |
+OylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOTJsjrDNYmiLbAJM+7 | |
+vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2qReW | |
+t88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcn | |
+HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx | |
+SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY= | |
+-----END CERTIFICATE----- | |
diff --git a/res/raw/tve_config_han_telia_se.pem b/res/raw/tve_config_han_telia_se.pem | |
new file mode 100644 | |
index 0000000..18efbfb | |
--- /dev/null | |
+++ b/res/raw/tve_config_han_telia_se.pem | |
@@ -0,0 +1,38 @@ | |
+-----BEGIN CERTIFICATE----- | |
+MIIGnzCCBIegAwIBAgIRAJ/q6SKDNAqllw+oTm2FX1IwDQYJKoZIhvcNAQELBQAw | |
+RjELMAkGA1UEBhMCRkkxFDASBgNVBAoMC1RlbGlhU29uZXJhMSEwHwYDVQQDDBhU | |
+ZWxpYVNvbmVyYSBTZXJ2ZXIgQ0EgdjIwHhcNMTYxMTExMTA1MDU2WhcNMTkxMTEx | |
+MTA1MDU2WjCBgTELMAkGA1UEBhMCU0UxDjAMBgNVBAgMBVNvbG5hMQ4wDAYDVQQH | |
+DAVTb2xuYTEZMBcGA1UECgwQVGVsaWEgQ29tcGFueSBBQjEVMBMGA1UECwwMVFZP | |
+cHMgQ29tbW9uMSAwHgYDVQQDDBd0dmUtY29uZmlnLmhhbi50ZWxpYS5zZTCCASIw | |
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMlYsriQup/h+ibhxYWnBCKBUNPK | |
+0WCqfaZPUo5RFtDDfFlkee6O5cyJgGgb7N17cf24BkgZD3p437KZU53K4m/g9Soi | |
+aNY938tSZcsFKtX+SAlOtXXv28zNsW+GwRlh+Mj/OCt49fd5IVKSSAnj1sNFMCNz | |
+V6NY5n3bCPWR6lisp7b2pdn4fnfiyhrkT/Js+Dnk25u/TrKq7x9JrLyhmicVo6Ep | |
+WlNK48jcccNFGHRnrINo3qzQJJb60Yi3e5nUP3fqtI+3BBnXPR6fvw238LOcxw58 | |
+L+OtwYTATAyt5FAJPF0zvqKnhwkwshtC3ZVSY6FiHzUhYefXH2kdyXICrUUCAwEA | |
+AaOCAkowggJGMIGNBggrBgEFBQcBAQSBgDB+MC0GCCsGAQUFBzABhiFodHRwOi8v | |
+b2NzcC50cnVzdC50ZWxpYXNvbmVyYS5jb20wTQYIKwYBBQUHMAKGQWh0dHA6Ly9y | |
+ZXBvc2l0b3J5LnRydXN0LnRlbGlhc29uZXJhLmNvbS90ZWxpYXNvbmVyYXNlcnZl | |
+cmNhdjIuY2VyMB8GA1UdIwQYMBaAFC9JPClP1wcl+caM1WT1Zj0SgyKVMFQGA1Ud | |
+IARNMEswSQYMKwYBBAGCDwIDAQEPMDkwNwYIKwYBBQUHAgEWK2h0dHA6Ly9yZXBv | |
+c2l0b3J5LnRydXN0LnRlbGlhc29uZXJhLmNvbS9DUFMwgcoGA1UdHwSBwjCBvzBC | |
+oECgPoY8aHR0cDovL2NybC0zLnRydXN0LnRlbGlhc29uZXJhLmNvbS90ZWxpYXNv | |
+bmVyYXNlcnZlcmNhdjIuY3JsMHmgd6B1hnNsZGFwOi8vY3JsLTEudHJ1c3QudGVs | |
+aWFzb25lcmEuY29tL2NuPVRlbGlhU29uZXJhJTIwU2VydmVyJTIwQ0ElMjB2Mixv | |
+PVRlbGlhU29uZXJhP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q7YmluYXJ5MB0G | |
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBLAwIgYD | |
+VR0RBBswGYIXdHZlLWNvbmZpZy5oYW4udGVsaWEuc2UwHQYDVR0OBBYEFNRDvGpO | |
+CUh2JGj6h0/h/nfvbFGDMA0GCSqGSIb3DQEBCwUAA4ICAQCpMvUWHX315u5lowj7 | |
+lhwjSeT83/i8dOoona+c9p7UE8nZH8+y6uMT2K0ycxqYKu+exZ1r60I6W6iYhcQC | |
+G2Wwrs4ekyXY17gMCWEiB61kL1VHEk96l+Vp8ViGmqwSWNKhzDApD9h8FisPlGw/ | |
+J1wOfOa8dN2KsKn6QF2NFYLw7HSWM6KrR1Uk5eH1pTF5dQcW9k+lEeS1shZyLbcG | |
+2jVv6V4Rz4E+I3ZWO1etQK7OQ6OdyJPh90nTHJKv54+dNkFYSOK9rS9FnJpTJnPt | |
+qDfk20WMq4nIkmTihldhM+cc7BENy4WpWfMFod3/3N9dDhNezDldrjcgY9PFTLsE | |
+O0EgtzPy25yPcug+rbsbHactDfEob+k+LH2czEEQz8vvgfCYDNHDlRkdLnnB02ah | |
+pDLmImNbpxTiRWv38fczSOUQpdDPXVMso3kSMmz4DhoQDQCs+Pt2lyFXoH2opmuz | |
+t4LNm6Q57VDz2LaOIrRTLbJuWJc4mLhpH2c8x8t1q1uVbJQKNc9BDDA/0TI79nTc | |
+cxKiSgK+DzxUI+5+L/nnYWynZBWVhPAgTly7XisoolDu3Pe3V6grfvxpAniadAGh | |
+I4ndudcGnSKRcKF06namjVwlIDLUk8oC8ATZRTqgg2m9gmBV65PhtIZ8C3rKT+Io | |
+NNkY+8GFqETlczDmI3pgDtNw3A== | |
+-----END CERTIFICATE----- | |
diff --git a/res/xml/dbg_net_security_config.xml b/res/xml/dbg_net_security_config.xml | |
index 611b0ca..a31de40 100644 | |
--- a/res/xml/dbg_net_security_config.xml | |
+++ b/res/xml/dbg_net_security_config.xml | |
@@ -1,8 +1,13 @@ | |
<?xml version="1.0" encoding="utf-8"?> | |
<network-security-config> | |
- <debug-overrides> | |
+ <base-config> | |
<trust-anchors> | |
- <certificates src="user" /> | |
+ <certificates src="@raw/tve_config_han_telia_se"/> | |
+ <certificates src="@raw/telia_server_ca_v2"/> | |
+ <certificates src="@raw/telia_root_ca_v1"/> | |
+ <certificates src="@raw/sonera_class2_ca"/> | |
+ <certificates src="system"/> | |
+ <certificates src="user"/> | |
</trust-anchors> | |
- </debug-overrides> | |
+ </base-config> | |
</network-security-config> | |
\ No newline at end of file | |
diff --git a/smali/com/teliasonera/tve/MainActivity.smali b/smali/com/teliasonera/tve/MainActivity.smali | |
index 5d7838a..10cdf3a 100644 | |
--- a/smali/com/teliasonera/tve/MainActivity.smali | |
+++ b/smali/com/teliasonera/tve/MainActivity.smali | |
@@ -4145,19 +4145,6 @@ | |
invoke-virtual {p1, v0}, Lcom/teliasonera/tve/cast/b;->a(Landroid/support/v7/app/MediaRouteButton;)V | |
- .line 202 | |
- iget-object p1, p0, Lcom/teliasonera/tve/MainActivity;->f:Lcom/teliasonera/tve/cast/b; | |
- | |
- invoke-static {}, Lcom/teliasonera/tve/TveApplication;->a()Lcom/teliasonera/tve/TveApplication; | |
- | |
- move-result-object v0 | |
- | |
- invoke-virtual {v0}, Lcom/teliasonera/tve/TveApplication;->B()Ljava/lang/String; | |
- | |
- move-result-object v0 | |
- | |
- invoke-virtual {p1, v0}, Lcom/teliasonera/tve/cast/b;->a(Ljava/lang/String;)V | |
- | |
.line 204 | |
invoke-static {}, Lcom/teliasonera/tve/TveApplication;->a()Lcom/teliasonera/tve/TveApplication; | |
diff --git a/smali/com/teliasonera/tve/cast/b.smali b/smali/com/teliasonera/tve/cast/b.smali | |
index 9c1c378..55ce414 100644 | |
--- a/smali/com/teliasonera/tve/cast/b.smali | |
+++ b/smali/com/teliasonera/tve/cast/b.smali | |
@@ -1494,230 +1494,21 @@ | |
.end method | |
.method public d()V | |
- .locals 3 | |
- | |
- .line 201 | |
- sget-object v0, Lcom/teliasonera/tve/cast/b;->a:Ljava/lang/String; | |
- | |
- const-string v1, "showNotification" | |
- | |
- invoke-static {v0, v1}, Lcom/teliasonera/tve/i/c;->c(Ljava/lang/String;Ljava/lang/String;)V | |
- | |
- .line 202 | |
- new-instance v0, Landroid/content/Intent; | |
- | |
- iget-object v1, p0, Lcom/teliasonera/tve/cast/b;->b:Landroid/content/Context; | |
- | |
- const-class v2, Lcom/teliasonera/tve/cast/TveCastNotificationService; | |
- | |
- invoke-direct {v0, v1, v2}, Landroid/content/Intent;-><init>(Landroid/content/Context;Ljava/lang/Class;)V | |
- | |
- const-string v1, "com.teliasonera.tve.cast.action.showNotification" | |
- | |
- .line 203 | |
- invoke-virtual {v0, v1}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent; | |
- | |
- .line 204 | |
- iget-object v1, p0, Lcom/teliasonera/tve/cast/b;->b:Landroid/content/Context; | |
- | |
- invoke-virtual {v1}, Landroid/content/Context;->getPackageName()Ljava/lang/String; | |
- | |
- move-result-object v1 | |
- | |
- invoke-virtual {v0, v1}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent; | |
- | |
- .line 205 | |
- invoke-static {}, Lcom/teliasonera/tve/TveApplication;->a()Lcom/teliasonera/tve/TveApplication; | |
- | |
- move-result-object v1 | |
- | |
- invoke-virtual {v1}, Lcom/teliasonera/tve/TveApplication;->n()Lcom/teliasonera/tve/h/f; | |
- | |
- move-result-object v1 | |
- | |
- invoke-virtual {v1}, Lcom/teliasonera/tve/h/f;->a()Lcom/teliasonera/tve/g/i; | |
- | |
- move-result-object v1 | |
- | |
- if-eqz v1, :cond_0 | |
- | |
- invoke-static {}, Lcom/teliasonera/tve/TveApplication;->a()Lcom/teliasonera/tve/TveApplication; | |
- | |
- move-result-object v1 | |
- | |
- invoke-virtual {v1}, Lcom/teliasonera/tve/TveApplication;->n()Lcom/teliasonera/tve/h/f; | |
- | |
- move-result-object v1 | |
- | |
- invoke-virtual {v1}, Lcom/teliasonera/tve/h/f;->a()Lcom/teliasonera/tve/g/i; | |
- | |
- move-result-object v1 | |
- | |
- invoke-virtual {v1}, Lcom/teliasonera/tve/g/i;->p()Lorg/json/JSONObject; | |
- | |
- move-result-object v1 | |
- | |
- if-eqz v1, :cond_0 | |
- | |
- const-string v1, "com.teliasonera.tve.cast.nowplaying" | |
- | |
- .line 206 | |
- invoke-static {}, Lcom/teliasonera/tve/TveApplication;->a()Lcom/teliasonera/tve/TveApplication; | |
- | |
- move-result-object v2 | |
- | |
- invoke-virtual {v2}, Lcom/teliasonera/tve/TveApplication;->n()Lcom/teliasonera/tve/h/f; | |
- | |
- move-result-object v2 | |
- | |
- invoke-virtual {v2}, Lcom/teliasonera/tve/h/f;->a()Lcom/teliasonera/tve/g/i; | |
- | |
- move-result-object v2 | |
- | |
- invoke-virtual {v2}, Lcom/teliasonera/tve/g/i;->p()Lorg/json/JSONObject; | |
- | |
- move-result-object v2 | |
- | |
- invoke-virtual {v2}, Lorg/json/JSONObject;->toString()Ljava/lang/String; | |
- | |
- move-result-object v2 | |
- | |
- invoke-virtual {v0, v1, v2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent; | |
- | |
- .line 208 | |
- :cond_0 | |
- iget-object v1, p0, Lcom/teliasonera/tve/cast/b;->f:Lcom/teliasonera/tve/player/o; | |
- | |
- invoke-virtual {v1}, Lcom/teliasonera/tve/player/o;->a()Lcom/teliasonera/tve/player/c; | |
- | |
- move-result-object v1 | |
- | |
- if-eqz v1, :cond_1 | |
- | |
- iget-object v1, p0, Lcom/teliasonera/tve/cast/b;->f:Lcom/teliasonera/tve/player/o; | |
- | |
- invoke-virtual {v1}, Lcom/teliasonera/tve/player/o;->a()Lcom/teliasonera/tve/player/c; | |
- | |
- move-result-object v1 | |
- | |
- invoke-interface {v1}, Lcom/teliasonera/tve/player/c;->j()Lcom/teliasonera/tve/g/f; | |
- | |
- move-result-object v1 | |
- | |
- if-eqz v1, :cond_1 | |
- | |
- const-string v1, "com.teliasonera.tve.cast.playerstate" | |
- | |
- .line 209 | |
- iget-object v2, p0, Lcom/teliasonera/tve/cast/b;->f:Lcom/teliasonera/tve/player/o; | |
- | |
- invoke-virtual {v2}, Lcom/teliasonera/tve/player/o;->a()Lcom/teliasonera/tve/player/c; | |
- | |
- move-result-object v2 | |
- | |
- invoke-interface {v2}, Lcom/teliasonera/tve/player/c;->j()Lcom/teliasonera/tve/g/f; | |
- | |
- move-result-object v2 | |
- | |
- invoke-virtual {v2}, Lcom/teliasonera/tve/g/f;->a()I | |
- | |
- move-result v2 | |
- | |
- invoke-virtual {v0, v1, v2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;I)Landroid/content/Intent; | |
- | |
- goto :goto_0 | |
- | |
- :cond_1 | |
- const-string v1, "com.teliasonera.tve.cast.playerstate" | |
- | |
- .line 211 | |
- sget-object v2, Lcom/teliasonera/tve/g/f;->b:Lcom/teliasonera/tve/g/f; | |
- | |
- invoke-virtual {v2}, Lcom/teliasonera/tve/g/f;->a()I | |
- | |
- move-result v2 | |
- | |
- invoke-virtual {v0, v1, v2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;I)Landroid/content/Intent; | |
- | |
- .line 213 | |
- :goto_0 | |
- iget-object v1, p0, Lcom/teliasonera/tve/cast/b;->b:Landroid/content/Context; | |
- | |
- invoke-virtual {v1, v0}, Landroid/content/Context;->startService(Landroid/content/Intent;)Landroid/content/ComponentName; | |
+ .locals 0 | |
return-void | |
.end method | |
.method public e()V | |
- .locals 3 | |
- | |
- .line 217 | |
- sget-object v0, Lcom/teliasonera/tve/cast/b;->a:Ljava/lang/String; | |
- | |
- const-string v1, "hideNotification" | |
- | |
- invoke-static {v0, v1}, Lcom/teliasonera/tve/i/c;->c(Ljava/lang/String;Ljava/lang/String;)V | |
- | |
- .line 218 | |
- sget-object v0, Lcom/teliasonera/tve/cast/b;->a:Ljava/lang/String; | |
- | |
- const-string v1, "sending ACTION_HIDE_NOTIFICATION to the service" | |
- | |
- invoke-static {v0, v1}, Lcom/teliasonera/tve/i/c;->c(Ljava/lang/String;Ljava/lang/String;)V | |
- | |
- .line 219 | |
- new-instance v0, Landroid/content/Intent; | |
- | |
- iget-object v1, p0, Lcom/teliasonera/tve/cast/b;->b:Landroid/content/Context; | |
- | |
- const-class v2, Lcom/teliasonera/tve/cast/TveCastNotificationService; | |
- | |
- invoke-direct {v0, v1, v2}, Landroid/content/Intent;-><init>(Landroid/content/Context;Ljava/lang/Class;)V | |
- | |
- const-string v1, "com.teliasonera.tve.cast.action.hideNotification" | |
- | |
- .line 220 | |
- invoke-virtual {v0, v1}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent; | |
- | |
- .line 221 | |
- iget-object v1, p0, Lcom/teliasonera/tve/cast/b;->b:Landroid/content/Context; | |
- | |
- invoke-virtual {v1, v0}, Landroid/content/Context;->startService(Landroid/content/Intent;)Landroid/content/ComponentName; | |
+ .locals 0 | |
return-void | |
.end method | |
.method public handleMessage(Landroid/os/Message;)Z | |
- .locals 3 | |
- | |
- .line 226 | |
- iget v0, p1, Landroid/os/Message;->what:I | |
+ .locals 1 | |
const/4 v1, 0x1 | |
- if-eq v0, v1, :cond_0 | |
- | |
- const/4 p1, 0x0 | |
- | |
- return p1 | |
- | |
- .line 228 | |
- :cond_0 | |
- sget-object v0, Lcom/teliasonera/tve/cast/b;->a:Ljava/lang/String; | |
- | |
- const-string v2, "MSG_GC_APP_ID_AVAILABLE" | |
- | |
- invoke-static {v0, v2}, Lcom/teliasonera/tve/i/c;->c(Ljava/lang/String;Ljava/lang/String;)V | |
- | |
- .line 229 | |
- iput-boolean v1, p0, Lcom/teliasonera/tve/cast/b;->l:Z | |
- | |
- .line 230 | |
- iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object; | |
- | |
- check-cast p1, Ljava/lang/String; | |
- | |
- invoke-virtual {p0, p1}, Lcom/teliasonera/tve/cast/b;->a(Ljava/lang/String;)V | |
- | |
return v1 | |
.end method | |
diff --git a/smali/com/teliasonera/tve/h/c.smali b/smali/com/teliasonera/tve/h/c.smali | |
index 8f8935d..47d8e92 100644 | |
--- a/smali/com/teliasonera/tve/h/c.smali | |
+++ b/smali/com/teliasonera/tve/h/c.smali | |
@@ -44,7 +44,7 @@ | |
iput-object v0, p0, Lcom/teliasonera/tve/h/c;->e:Ljava/lang/Object; | |
- const-string v0, "https://tve-config.han.telia.se/config/outputRestrictions.json" | |
+ const-string v0, "https://INPUT_YOUR_OWN_DOMAIN/outputRestrictions.json" | |
.line 174 | |
iput-object v0, p0, Lcom/teliasonera/tve/h/c;->g:Ljava/lang/String; | |
-- | |
2.10.5 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
The link to the json file above can be replaced with the link below until Telia starts using a certificate issued by a root that is trusted on Android.
https://gist.githubusercontent.com/blunden/0dda577517e9e7345b452cf4cc128cd9/raw/c5650946a458ce8e4e205babf743a3899039c386/outputRestrictions.json