diff --git a/app/build.gradle b/app/build.gradle index 22fe1d632..341baf1ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,8 +47,20 @@ android { } } - flavorDimensions 'testing', 'license' + flavorDimensions = ['provider', 'testing', 'license'] + productFlavors { + ooni { + dimension 'provider' + } + dw { + dimension 'provider' + applicationId 'com.dw.ooniprobe' + resValue "string", "APP_ID", 'com.dw.ooniprobe' + resValue "string", "APP_NAME", "News Media Scan" + buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"news-media-scan-android"' + buildConfigField "boolean", "SHOW_DISABLED_CARDS", "false" + } stable { dimension 'testing' buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"ooniprobe-android"' @@ -59,7 +71,7 @@ android { versionNameSuffix "-beta.1" versionCode versionCodeDate() buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"ooniprobe-android-dev"' - resValue "string", "APP_ID", 'org.openobservatory.ooniprobe.dev' + resValue "string", "APP_ID", "${applicationId}.dev" resValue "string", "APP_NAME", "OONI Dev" buildConfigField 'String', 'COUNTLY_KEY', '"e6c2cfe53e85951d50567467cef3f9fa2eab32c3"' } @@ -69,7 +81,7 @@ android { versionNameSuffix "-experimental.1" versionCode versionCodeDate() buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"ooniprobe-android-experimental"' - resValue "string", "APP_ID", 'org.openobservatory.ooniprobe.experimental' + resValue "string", "APP_ID", "${applicationId}.experimental" resValue "string", "APP_NAME", "OONI Exp" buildConfigField 'String', 'COUNTLY_KEY', '"e6c2cfe53e85951d50567467cef3f9fa2eab32c3"' } @@ -79,16 +91,6 @@ android { full { dimension 'license' } - dw { - dimension 'testing' - applicationId 'com.dw.ooniprobe' - resValue "string", "APP_ID", 'com.dw.ooniprobe' - resValue "string", "APP_NAME", "News Media Scan" - buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"news-media-scan-android"' - buildConfigField "boolean", "SHOW_DISABLED_CARDS", "false" - //versionName '0.0.1' - //versionCode 1 - } } variantFilter { variant -> def names = variant.flavors*.name @@ -192,3 +194,12 @@ if (!getGradle().getStartParameter().getTaskRequests() .toString().contains("Fdroid")){ apply plugin: 'com.google.gms.google-services' } + +preBuild.doFirst { + // copy resources to right folders here + /*android.applicationVariants.all { variant -> + variant.productFlavors.each { flavor -> + println "Flavor: ${flavor.name}" + } + }*/ +} \ No newline at end of file diff --git a/app/src/dw/dev/google-services.json b/app/src/dw/dev/google-services.json new file mode 100644 index 000000000..23ae6af0f --- /dev/null +++ b/app/src/dw/dev/google-services.json @@ -0,0 +1,56 @@ +{ + "project_info": { + "project_number": "951667061699", + "firebase_url": "https://ooniprobe-android.firebaseio.com", + "project_id": "ooniprobe-android", + "storage_bucket": "ooniprobe-android.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:951667061699:android:6293922d7e8d4180374376", + "android_client_info": { + "package_name": "com.dw.ooniprobe.dev" + } + }, + "oauth_client": [ + { + "client_id": "951667061699-6ijvga26pl048jrqfnd33o60bqcn0g7c.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.dw.ooniprobe.dev", + "certificate_hash": "a8f4bc5bef49e43d386647bdffdad32c07a8d3b8" + } + }, + { + "client_id": "951667061699-2aq9bnbot04qdjbed2bpnl9ee4ro0c39.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBsbX_pOQoqlyOOyZ6yf7CJf0lZZn6O1yg" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "951667061699-2aq9bnbot04qdjbed2bpnl9ee4ro0c39.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "951667061699-tuprsdjjv9eje6506lkvkski1p6v87lp.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "org.openobservatory.ooniprobe", + "app_store_id": "1199566366" + } + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/src/dw/experimental/google-services.json b/app/src/dw/experimental/google-services.json new file mode 100644 index 000000000..ea8eb8a3e --- /dev/null +++ b/app/src/dw/experimental/google-services.json @@ -0,0 +1,56 @@ +{ + "project_info": { + "project_number": "951667061699", + "firebase_url": "https://ooniprobe-android.firebaseio.com", + "project_id": "ooniprobe-android", + "storage_bucket": "ooniprobe-android.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:951667061699:android:6293922d7e8d4180374376", + "android_client_info": { + "package_name": "com.dw.ooniprobe.experimental" + } + }, + "oauth_client": [ + { + "client_id": "951667061699-6ijvga26pl048jrqfnd33o60bqcn0g7c.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.dw.ooniprobe.experimental", + "certificate_hash": "a8f4bc5bef49e43d386647bdffdad32c07a8d3b8" + } + }, + { + "client_id": "951667061699-2aq9bnbot04qdjbed2bpnl9ee4ro0c39.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBsbX_pOQoqlyOOyZ6yf7CJf0lZZn6O1yg" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "951667061699-2aq9bnbot04qdjbed2bpnl9ee4ro0c39.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "951667061699-tuprsdjjv9eje6506lkvkski1p6v87lp.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "org.openobservatory.ooniprobe", + "app_store_id": "1199566366" + } + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/src/dw/res/values-ar/strings.xml b/app/src/dw/res/values-ar/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-ar/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-ca/strings.xml b/app/src/dw/res/values-ca/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-ca/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-de/strings.xml b/app/src/dw/res/values-de/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-de/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-el/strings.xml b/app/src/dw/res/values-el/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-el/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-es/strings.xml b/app/src/dw/res/values-es/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-es/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-fa/strings.xml b/app/src/dw/res/values-fa/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-fa/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-fr/strings.xml b/app/src/dw/res/values-fr/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-fr/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-hi/strings.xml b/app/src/dw/res/values-hi/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-hi/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-id/strings.xml b/app/src/dw/res/values-id/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-id/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-is/strings.xml b/app/src/dw/res/values-is/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-is/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-it/strings.xml b/app/src/dw/res/values-it/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-it/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-night/colors.xml b/app/src/dw/res/values-night/colors.xml deleted file mode 100644 index 8a4525311..000000000 --- a/app/src/dw/res/values-night/colors.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - #D32625 - #4B545C - @color/color_secondary - @color/color_secondary - @color/color_secondary - \ No newline at end of file diff --git a/app/src/dw/res/values-nl/strings.xml b/app/src/dw/res/values-nl/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-nl/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-pt-rBR/strings.xml b/app/src/dw/res/values-pt-rBR/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-ro/strings.xml b/app/src/dw/res/values-ro/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-ro/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-ru/strings.xml b/app/src/dw/res/values-ru/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-ru/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-sk/strings.xml b/app/src/dw/res/values-sk/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-sk/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-sq/strings.xml b/app/src/dw/res/values-sq/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-sq/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-sw/strings.xml b/app/src/dw/res/values-sw/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-sw/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-th/strings.xml b/app/src/dw/res/values-th/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-th/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-tr/strings.xml b/app/src/dw/res/values-tr/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-tr/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-zh-rCN/strings.xml b/app/src/dw/res/values-zh-rCN/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dw/res/values-zh-rTW/strings.xml b/app/src/dw/res/values-zh-rTW/strings.xml deleted file mode 100644 index a7e166f1a..000000000 --- a/app/src/dw/res/values-zh-rTW/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - News Media Scan - Are news media sites blocked? - Run News Media Scan to find out! News Media Scan is the #1 app to give you transparency about the news landscape in whatever country you currently find yourself. Additionally, by using the app, you are making an important contribution to the measurement of censorship around the world.\n\nThe list you see in the app is a public, community-curated list on GitHub and not curated by DW. It represents an objective range of international and national news media providers. - OONI will openly publish the measurement data you send, along with your network information. - Anyone monitoring your Internet connection will be able to see you are running News Media Scan. - You will be testing news websites that might be banned in the country where you currently find yourself. - To measure internet censorship every day, please enable automated testing so that News Media Scan can run tests periodically.\n\nDon’t worry, we’ll be mindful of battery usage.\n\nYou can disable automated testing from the settings at any time. - To improve News Media Scan we would like to collect anonymous crash reports when the app does not work properly.\n\nWould you like to opt-in to submitting crash reports to the OONI development team? - If someone is monitoring my internet activity, they will see that I am running News Media Scan. - News Media Scan is not a privacy tool. Anyone monitoring your internet activity will see which software you are running. - Every time I run News Media Scan, the network data I collect will automatically get published. - To increase transparency of internet censorship, the network data of all News Media Scan users is automatically published (unless they opt-out in the settings). - About News Media Scan - Backend proxy - This app is the product of close cooperation between Deutsche Welle (DW) and OONI. \n\n_About DW:_ Unbiased information for free minds – that is the DW brand promise. As an independent media company, Germany’s international news broadcaster informs people around the world. With programming in 32 languages, DW connects people across the globe via TV, radio, Internet and on social media. \n\n[About DW](https://corporate.dw.com/en/about-dw/s-30688) \n\n_About OONI:_ Founded in 2012, the Open Observatory of Network Interference (OONI) is a non-profit free software project that aims to empower decentralized efforts in documenting internet censorship around the world. Thanks to their global community, [more than a billion network measurements](https://explorer.ooni.org/) have been published from more than 200 countries, shedding light on cases of internet censorship worldwide. \n\nBe part of the internet freedom movement by providing data from the networks you’re using. - - News Media Websites - Checks for blocking of news media websites - - \ No newline at end of file diff --git a/app/src/dwFull/google-services.json b/app/src/dw/stable/full/google-services.json similarity index 100% rename from app/src/dwFull/google-services.json rename to app/src/dw/stable/full/google-services.json diff --git a/app/src/main/java/org/openobservatory/ooniprobe/common/PreferenceManager.java b/app/src/main/java/org/openobservatory/ooniprobe/common/PreferenceManager.java index ba228a80b..f723086ac 100644 --- a/app/src/main/java/org/openobservatory/ooniprobe/common/PreferenceManager.java +++ b/app/src/main/java/org/openobservatory/ooniprobe/common/PreferenceManager.java @@ -13,6 +13,7 @@ import java.net.URISyntaxException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.Locale; @@ -328,9 +329,12 @@ public boolean isAutomaticTestEnabled() { public String getSettingsLanguage() { String language = sp.getString(r.getString(R.string.language_setting), Locale.getDefault().getLanguage()); if (language.equals("auto")) { - return Locale.getDefault().getLanguage(); + language = Locale.getDefault().getLanguage(); } - return language; + if (new ArrayList<>(Arrays.asList(r.getStringArray(R.array.language_sort_options_values))).contains(language)){ + return language; + } + return "en"; } public void enableAutomatedTesting() { diff --git a/app/src/main/java/org/openobservatory/ooniprobe/test/suite/WebsitesSuite.java b/app/src/main/java/org/openobservatory/ooniprobe/test/suite/WebsitesSuite.java index 73a39bdd1..cc8c31427 100644 --- a/app/src/main/java/org/openobservatory/ooniprobe/test/suite/WebsitesSuite.java +++ b/app/src/main/java/org/openobservatory/ooniprobe/test/suite/WebsitesSuite.java @@ -16,8 +16,8 @@ public WebsitesSuite() { R.string.Test_Websites_Fullname, R.string.Dashboard_Websites_Card_Description, R.drawable.test_websites, - BuildConfig.FLAVOR_testing.equals("dw") ? R.drawable.test_websites : R.drawable.test_websites_24, - BuildConfig.FLAVOR_testing.equals("dw") ? R.color.color_base : R.color.color_indigo6, + BuildConfig.FLAVOR_provider.equals("dw") ? R.drawable.test_websites : R.drawable.test_websites_24, + BuildConfig.FLAVOR_provider.equals("dw") ? R.color.color_base : R.color.color_indigo6, R.style.Theme_MaterialComponents_Light_DarkActionBar_App_NoActionBar_Websites, R.style.Theme_MaterialComponents_NoActionBar_App_Websites, R.string.Dashboard_Websites_Overview_Paragraph, diff --git a/app/src/main/res/values/untraslatable.xml b/app/src/main/res/values/untraslatable.xml index f3490ad0d..19dbaefb2 100644 --- a/app/src/main/res/values/untraslatable.xml +++ b/app/src/main/res/values/untraslatable.xml @@ -261,59 +261,9 @@ language_setting Automatic - Albanian - العربية - Català - 中文 (S) - 中文 (T) - Nederlands - English - فارسی - Français - Deutsch - Ελληνικά - हिन्दी - Icelandic - Indonesia - Italiano - Português - Română - Pусский - Slovenčina - Español - Kiswahili - ไทย - Türkçe - Tiếng Việt - မြန်မာ auto - sq - ar - ca - zh_CN - zh_TW - nl - en - fa - fr - de - el - hi - is - id - it - pt_BR - ro - ru - sk - es - sw - th - tr - vi - my @string/SOCKS5 diff --git a/app/src/dev/google-services.json b/app/src/ooni/dev/google-services.json similarity index 100% rename from app/src/dev/google-services.json rename to app/src/ooni/dev/google-services.json diff --git a/app/src/dev/ic_launcher-playstore.png b/app/src/ooni/dev/ic_launcher-playstore.png similarity index 100% rename from app/src/dev/ic_launcher-playstore.png rename to app/src/ooni/dev/ic_launcher-playstore.png diff --git a/app/src/ooni/dev/readme.md b/app/src/ooni/dev/readme.md new file mode 100644 index 000000000..c054bb84a --- /dev/null +++ b/app/src/ooni/dev/readme.md @@ -0,0 +1,3 @@ +# OONI Dev +This is a collection of resources to be used by the OONI specific flavors of the application. +A corresponding directory exits in [app/src/dw](../../dw). \ No newline at end of file diff --git a/app/src/experimental/google-services.json b/app/src/ooni/experimental/google-services.json similarity index 100% rename from app/src/experimental/google-services.json rename to app/src/ooni/experimental/google-services.json diff --git a/app/src/experimental/ic_launcher-playstore.png b/app/src/ooni/experimental/ic_launcher-playstore.png similarity index 100% rename from app/src/experimental/ic_launcher-playstore.png rename to app/src/ooni/experimental/ic_launcher-playstore.png diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/ooni/res/values-ar/strings.xml similarity index 100% rename from app/src/main/res/values-ar/strings.xml rename to app/src/ooni/res/values-ar/strings.xml diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/ooni/res/values-ca/strings.xml similarity index 100% rename from app/src/main/res/values-ca/strings.xml rename to app/src/ooni/res/values-ca/strings.xml diff --git a/app/src/main/res/values-de/strings.xml b/app/src/ooni/res/values-de/strings.xml similarity index 100% rename from app/src/main/res/values-de/strings.xml rename to app/src/ooni/res/values-de/strings.xml diff --git a/app/src/main/res/values-el/strings.xml b/app/src/ooni/res/values-el/strings.xml similarity index 100% rename from app/src/main/res/values-el/strings.xml rename to app/src/ooni/res/values-el/strings.xml diff --git a/app/src/main/res/values-es/strings.xml b/app/src/ooni/res/values-es/strings.xml similarity index 100% rename from app/src/main/res/values-es/strings.xml rename to app/src/ooni/res/values-es/strings.xml diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/ooni/res/values-fa/strings.xml similarity index 100% rename from app/src/main/res/values-fa/strings.xml rename to app/src/ooni/res/values-fa/strings.xml diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/ooni/res/values-fr/strings.xml similarity index 100% rename from app/src/main/res/values-fr/strings.xml rename to app/src/ooni/res/values-fr/strings.xml diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/ooni/res/values-hi/strings.xml similarity index 100% rename from app/src/main/res/values-hi/strings.xml rename to app/src/ooni/res/values-hi/strings.xml diff --git a/app/src/main/res/values-id/strings.xml b/app/src/ooni/res/values-id/strings.xml similarity index 100% rename from app/src/main/res/values-id/strings.xml rename to app/src/ooni/res/values-id/strings.xml diff --git a/app/src/main/res/values-is/strings.xml b/app/src/ooni/res/values-is/strings.xml similarity index 100% rename from app/src/main/res/values-is/strings.xml rename to app/src/ooni/res/values-is/strings.xml diff --git a/app/src/main/res/values-it/strings.xml b/app/src/ooni/res/values-it/strings.xml similarity index 100% rename from app/src/main/res/values-it/strings.xml rename to app/src/ooni/res/values-it/strings.xml diff --git a/app/src/main/res/values-my/strings.xml b/app/src/ooni/res/values-my/strings.xml similarity index 100% rename from app/src/main/res/values-my/strings.xml rename to app/src/ooni/res/values-my/strings.xml diff --git a/app/src/main/res/values-night/colors.xml b/app/src/ooni/res/values-night/colors.xml similarity index 100% rename from app/src/main/res/values-night/colors.xml rename to app/src/ooni/res/values-night/colors.xml diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/ooni/res/values-nl/strings.xml similarity index 100% rename from app/src/main/res/values-nl/strings.xml rename to app/src/ooni/res/values-nl/strings.xml diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/ooni/res/values-pt-rBR/strings.xml similarity index 100% rename from app/src/main/res/values-pt-rBR/strings.xml rename to app/src/ooni/res/values-pt-rBR/strings.xml diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/ooni/res/values-ro/strings.xml similarity index 100% rename from app/src/main/res/values-ro/strings.xml rename to app/src/ooni/res/values-ro/strings.xml diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/ooni/res/values-ru/strings.xml similarity index 100% rename from app/src/main/res/values-ru/strings.xml rename to app/src/ooni/res/values-ru/strings.xml diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/ooni/res/values-sk/strings.xml similarity index 100% rename from app/src/main/res/values-sk/strings.xml rename to app/src/ooni/res/values-sk/strings.xml diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/ooni/res/values-sq/strings.xml similarity index 100% rename from app/src/main/res/values-sq/strings.xml rename to app/src/ooni/res/values-sq/strings.xml diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/ooni/res/values-sw/strings.xml similarity index 100% rename from app/src/main/res/values-sw/strings.xml rename to app/src/ooni/res/values-sw/strings.xml diff --git a/app/src/main/res/values-th/strings.xml b/app/src/ooni/res/values-th/strings.xml similarity index 100% rename from app/src/main/res/values-th/strings.xml rename to app/src/ooni/res/values-th/strings.xml diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/ooni/res/values-tr/strings.xml similarity index 100% rename from app/src/main/res/values-tr/strings.xml rename to app/src/ooni/res/values-tr/strings.xml diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/ooni/res/values-vi/strings.xml similarity index 100% rename from app/src/main/res/values-vi/strings.xml rename to app/src/ooni/res/values-vi/strings.xml diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/ooni/res/values-zh-rCN/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/strings.xml rename to app/src/ooni/res/values-zh-rCN/strings.xml diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/ooni/res/values-zh-rTW/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/strings.xml rename to app/src/ooni/res/values-zh-rTW/strings.xml diff --git a/app/src/ooni/res/values/untraslatable.xml b/app/src/ooni/res/values/untraslatable.xml new file mode 100644 index 000000000..c4c13f6fb --- /dev/null +++ b/app/src/ooni/res/values/untraslatable.xml @@ -0,0 +1,58 @@ + + + Automatic + Albanian + العربية + Català + 中文 (S) + 中文 (T) + Nederlands + English + فارسی + Français + Deutsch + Ελληνικά + हिन्दी + Icelandic + Indonesia + Italiano + Português + Română + Pусский + Slovenčina + Español + Kiswahili + ไทย + Türkçe + Tiếng Việt + မြန်မာ + + + auto + sq + ar + ca + zh_CN + zh_TW + nl + en + fa + fr + de + el + hi + is + id + it + pt_BR + ro + ru + sk + es + sw + th + tr + vi + my + + diff --git a/app/src/stableFull/google-services.json b/app/src/ooni/stable/full/google-services.json similarity index 100% rename from app/src/stableFull/google-services.json rename to app/src/ooni/stable/full/google-services.json diff --git a/app/src/ooni/stable/full/readme.md b/app/src/ooni/stable/full/readme.md new file mode 100644 index 000000000..5484adcd1 --- /dev/null +++ b/app/src/ooni/stable/full/readme.md @@ -0,0 +1,2 @@ +# OONI Stable Full +Previously `stableFull`