diff --git a/app/build.gradle b/app/build.gradle index a42015c366c5e26777f11d63cfa4916cb3affb3b..dec91bee4620de54a442bb525ab06f99951ade1a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -339,8 +339,7 @@ android { } samsung { -// resValue "string", "app_name", "NYNJA for\nSamsung" - resValue "string", "app_name", "NYNJA" + resValue "string", "app_name", "NYNJA for\nSamsung" dimension "default" buildConfigField 'int', 'CONNECTION_VERSION', '11' buildConfigField 'String', 'BASE_URL', '"wss://im.nynja.net"' @@ -385,8 +384,7 @@ android { } samsungDev { -// resValue "string", "app_name", "NYNJA for\nSamsung" - resValue "string", "app_name", "NYNJA" + resValue "string", "app_name", "NYNJA for\nSamsung" dimension "default" buildConfigField 'int', 'CONNECTION_VERSION', '11' @@ -433,8 +431,7 @@ android { } samsungPreProd { -// resValue "string", "app_name", "NYNJA for\nSamsung" - resValue "string", "app_name", "NYNJA" + resValue "string", "app_name", "NYNJA for\nSamsung" dimension "default" buildConfigField 'int', 'CONNECTION_VERSION', '11' diff --git a/app/src/Samsung/res/drawable-nodpi/bg_splash.png b/app/src/Samsung/res/drawable-nodpi/bg_splash.png new file mode 100755 index 0000000000000000000000000000000000000000..433a83e9ecb73302fc0edc41f8f79dc980bdba4a Binary files /dev/null and b/app/src/Samsung/res/drawable-nodpi/bg_splash.png differ diff --git a/app/src/Samsung/res/mipmap-hdpi/ic_launcher.png b/app/src/Samsung/res/mipmap-hdpi/ic_launcher.png old mode 100644 new mode 100755 index 62e94f139aaa5a235391fe8b9c5f7c3e3c9a9111..c57cffa9876304561c2b3e82be4abd6a63ee501e Binary files a/app/src/Samsung/res/mipmap-hdpi/ic_launcher.png and b/app/src/Samsung/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/Samsung/res/mipmap-mdpi/ic_launcher.png b/app/src/Samsung/res/mipmap-mdpi/ic_launcher.png old mode 100644 new mode 100755 index a6e05de7e23ef2a12b73f244b450507c7ff4abc0..31354b341935518f68d2c29fe996f16b2e0a5eed Binary files a/app/src/Samsung/res/mipmap-mdpi/ic_launcher.png and b/app/src/Samsung/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/Samsung/res/mipmap-xhdpi/ic_launcher.png b/app/src/Samsung/res/mipmap-xhdpi/ic_launcher.png old mode 100644 new mode 100755 index abaa3862820ea673688b40fc738cfd84fad6ef4e..46904a564e23dce0c4ce8da4838569bfba6c6947 Binary files a/app/src/Samsung/res/mipmap-xhdpi/ic_launcher.png and b/app/src/Samsung/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/Samsung/res/mipmap-xxhdpi/ic_launcher.png b/app/src/Samsung/res/mipmap-xxhdpi/ic_launcher.png old mode 100644 new mode 100755 index c5eb1adb93709aedf819c4d6f207484bb0562f96..d01c30fd8cef280f109aaad03cd2616560110143 Binary files a/app/src/Samsung/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/Samsung/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/Samsung/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/Samsung/res/mipmap-xxxhdpi/ic_launcher.png old mode 100644 new mode 100755 index 4e315b1dae050877bdb22d98cae18a1ca172bb86..1862d947c335168e6597e938f8678b087fede838 Binary files a/app/src/Samsung/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/Samsung/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/SamsungDev/res/drawable-nodpi/bg_splash.png b/app/src/SamsungDev/res/drawable-nodpi/bg_splash.png old mode 100644 new mode 100755 index 2015ce482b6e0904afd886e4c3910197cd0a78de..433a83e9ecb73302fc0edc41f8f79dc980bdba4a Binary files a/app/src/SamsungDev/res/drawable-nodpi/bg_splash.png and b/app/src/SamsungDev/res/drawable-nodpi/bg_splash.png differ diff --git a/app/src/SamsungDev/res/mipmap-hdpi/ic_launcher.png b/app/src/SamsungDev/res/mipmap-hdpi/ic_launcher.png old mode 100644 new mode 100755 index 62e94f139aaa5a235391fe8b9c5f7c3e3c9a9111..c57cffa9876304561c2b3e82be4abd6a63ee501e Binary files a/app/src/SamsungDev/res/mipmap-hdpi/ic_launcher.png and b/app/src/SamsungDev/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/SamsungDev/res/mipmap-mdpi/ic_launcher.png b/app/src/SamsungDev/res/mipmap-mdpi/ic_launcher.png old mode 100644 new mode 100755 index a6e05de7e23ef2a12b73f244b450507c7ff4abc0..31354b341935518f68d2c29fe996f16b2e0a5eed Binary files a/app/src/SamsungDev/res/mipmap-mdpi/ic_launcher.png and b/app/src/SamsungDev/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/SamsungDev/res/mipmap-xhdpi/ic_launcher.png b/app/src/SamsungDev/res/mipmap-xhdpi/ic_launcher.png old mode 100644 new mode 100755 index abaa3862820ea673688b40fc738cfd84fad6ef4e..46904a564e23dce0c4ce8da4838569bfba6c6947 Binary files a/app/src/SamsungDev/res/mipmap-xhdpi/ic_launcher.png and b/app/src/SamsungDev/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/SamsungDev/res/mipmap-xxhdpi/ic_launcher.png b/app/src/SamsungDev/res/mipmap-xxhdpi/ic_launcher.png old mode 100644 new mode 100755 index c5eb1adb93709aedf819c4d6f207484bb0562f96..d01c30fd8cef280f109aaad03cd2616560110143 Binary files a/app/src/SamsungDev/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/SamsungDev/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/SamsungDev/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/SamsungDev/res/mipmap-xxxhdpi/ic_launcher.png old mode 100644 new mode 100755 index 4e315b1dae050877bdb22d98cae18a1ca172bb86..1862d947c335168e6597e938f8678b087fede838 Binary files a/app/src/SamsungDev/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/SamsungDev/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/SamsungPreProd/res/drawable-nodpi/bg_splash.png b/app/src/SamsungPreProd/res/drawable-nodpi/bg_splash.png old mode 100644 new mode 100755 index 2015ce482b6e0904afd886e4c3910197cd0a78de..433a83e9ecb73302fc0edc41f8f79dc980bdba4a Binary files a/app/src/SamsungPreProd/res/drawable-nodpi/bg_splash.png and b/app/src/SamsungPreProd/res/drawable-nodpi/bg_splash.png differ diff --git a/app/src/SamsungPreProd/res/mipmap-hdpi/ic_launcher.png b/app/src/SamsungPreProd/res/mipmap-hdpi/ic_launcher.png old mode 100644 new mode 100755 index 62e94f139aaa5a235391fe8b9c5f7c3e3c9a9111..c57cffa9876304561c2b3e82be4abd6a63ee501e Binary files a/app/src/SamsungPreProd/res/mipmap-hdpi/ic_launcher.png and b/app/src/SamsungPreProd/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/SamsungPreProd/res/mipmap-mdpi/ic_launcher.png b/app/src/SamsungPreProd/res/mipmap-mdpi/ic_launcher.png old mode 100644 new mode 100755 index a6e05de7e23ef2a12b73f244b450507c7ff4abc0..31354b341935518f68d2c29fe996f16b2e0a5eed Binary files a/app/src/SamsungPreProd/res/mipmap-mdpi/ic_launcher.png and b/app/src/SamsungPreProd/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/SamsungPreProd/res/mipmap-xhdpi/ic_launcher.png b/app/src/SamsungPreProd/res/mipmap-xhdpi/ic_launcher.png old mode 100644 new mode 100755 index abaa3862820ea673688b40fc738cfd84fad6ef4e..46904a564e23dce0c4ce8da4838569bfba6c6947 Binary files a/app/src/SamsungPreProd/res/mipmap-xhdpi/ic_launcher.png and b/app/src/SamsungPreProd/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/SamsungPreProd/res/mipmap-xxhdpi/ic_launcher.png b/app/src/SamsungPreProd/res/mipmap-xxhdpi/ic_launcher.png old mode 100644 new mode 100755 index c5eb1adb93709aedf819c4d6f207484bb0562f96..d01c30fd8cef280f109aaad03cd2616560110143 Binary files a/app/src/SamsungPreProd/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/SamsungPreProd/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/SamsungPreProd/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/SamsungPreProd/res/mipmap-xxxhdpi/ic_launcher.png old mode 100644 new mode 100755 index 4e315b1dae050877bdb22d98cae18a1ca172bb86..1862d947c335168e6597e938f8678b087fede838 Binary files a/app/src/SamsungPreProd/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/SamsungPreProd/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/SamsungPreProd/res/raw/cert_1.pem b/app/src/SamsungPreProd/res/raw/cert_1.pem new file mode 100644 index 0000000000000000000000000000000000000000..109f829ebac23f773117d35ef8866a89517e74d4 --- /dev/null +++ b/app/src/SamsungPreProd/res/raw/cert_1.pem @@ -0,0 +1,59 @@ +-----BEGIN CERTIFICATE----- +MIIFYTCCBEmgAwIBAgISBLBoNRwQrTBxsvK1qQGJMPs1MA0GCSqGSIb3DQEBCwUA +MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTAxMTYxNTA4MDJaFw0x +OTA0MTYxNTA4MDJaMB8xHTAbBgNVBAMTFHByZXByb2QuY2kubnluamEubmV0MIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzVdElhE0COslyMgtM4C0RK4s +7Y6nWAXk9W3fthXbeZ/KsV9aqYDqAACY4AOTVPJRguG4pqDJfFC3nnE5DIP1JwsP +mbhF/LEUUPRJxaw2ZgG107eNd135a3YLCnatCqoUGZaBugAUJm0MiNmLjdx77aZM +6WbwCRg8okqETsnqpr3T/B4m+HI4cBnZpE/sgVOGbpKt3aI4IDOUUuaPlGzj2rGT +wcPuKMV0/TE3DvWNU+KUxOMXnrqlOGYyqD08Lnd3twP0mKHWDSdE7frvYDBJunMv +MqaV5oXZ2rEZHkvL3yS+LHyr1OMgE380OjiWI0vdzIex3wX1c05eZ28X2lyVxwID +AQABo4ICajCCAmYwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB +BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBR/mMtrTxsuSvwlcT/p +7SS+Ph3bMzAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBvBggrBgEF +BQcBAQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmludC14My5sZXRzZW5j +cnlwdC5vcmcwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5j +cnlwdC5vcmcvMB8GA1UdEQQYMBaCFHByZXByb2QuY2kubnluamEubmV0MEwGA1Ud +IARFMEMwCAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0 +dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDx +AHYA4mlLribo6UAJ6IYbtjuD1D7n/nSI+6SPKJMBnd3x2/4AAAFoV2tlUgAABAMA +RzBFAiEA6e8/6+89WTPR1gZcv6EOKYpodLslgKSIyfGi4Adqu6kCID3cbbevlSf5 +v0sdkZCEA6oQf0TIkSybcI9X5rRBWlxjAHcAY/Lbzeg7zCzPC3KEJ1drM6SNYXeP +vXWmOLHHaFRL2I0AAAFoV2tlXAAABAMASDBGAiEA4bW79RKW2ajaUGV0QsE1VPrp +gvYYGLaLB43Im7rrUzECIQDgzQ9X7xS3NPCByxh1MfTauUAfUfIcp/lIQ3hCb2tS +CzANBgkqhkiG9w0BAQsFAAOCAQEAfcliLQIbIcc+rL45fxlouJL69l2HaQkLE4KU +qFKGfhCpToDIOzVjwTR/0CFAeoPeWPzq8rckxNluEf9MOM9D1pCLOoNkJPpD4VlG +/1WiiKELk0v7Wwx3h6iRNAqmgInZPfXmSI07bF23UoSa4OJ8zKCA+QHzmvTMnMsP +n8GWg2B/jVX7Rmxgb/gUcWRhgYxkt+isSHHOH1cJDtf/Vvrrb6612NDlUnUTRV0U +IkONo7XahYdd4O5+4ZJSDqivlpzt6J0mMDQqtBfmVcNMXQA4xNuhSISNXSQptNe9 +n9KNO7OYj6q45G6GTzDK2m1H6Cka3hnQk7WFf//kyuwEpi4kmA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ +MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT +DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow +SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT +GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF +q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8 +SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0 +Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA +a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj +/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T +AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG +CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv +bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k +c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw +VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC +ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz +MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu +Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF +AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo +uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/ +wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu +X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG +PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6 +KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg== +-----END CERTIFICATE----- +