diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/MainMenuFragmentTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/MainMenuFragmentTest.kt index 6fad7236837..ad728d80a2f 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/MainMenuFragmentTest.kt +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/MainMenuFragmentTest.kt @@ -186,16 +186,6 @@ class MainMenuFragmentTest : KoinTest { connectionMonitor.setValueTo(true) } - @Test - fun testBackButtonAfterTappingOnUploadButton() { - syncBeforeLaunch(false) - onView(withId(R.id.uploadProject)) - .perform(ViewActions.click()) - pressBack() - onView(withId(R.id.projectImageView)) - .check(matches(isDisplayed())) - } - @Test fun testBackButtonAfterTappingOnPlayButton() { syncBeforeLaunch(false) diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/ProjectOptionsTest.java b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/ProjectOptionsTest.java index 6d9f0a4d8bc..3548c5f108b 100644 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/ProjectOptionsTest.java +++ b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/ProjectOptionsTest.java @@ -299,16 +299,6 @@ public void changeAspectRatio() { assertEquals(ScreenModes.MAXIMIZE, project.getScreenMode()); } - @Test - public void uploadProject() { - onView(withId(R.id.project_options_upload)) - .perform(ViewActions.scrollTo()) - .perform(click()); - - onView(anyOf(withId(R.id.upload_layout), withText(R.string.login))) - .check(matches(isDisplayed())); - } - @Test public void saveExternal() throws IOException { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/UploadUnmodifiedExampleProjectTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/UploadUnmodifiedExampleProjectTest.kt deleted file mode 100644 index cfff0d454ac..00000000000 --- a/catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/UploadUnmodifiedExampleProjectTest.kt +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Catroid: An on-device visual programming system for Android devices - * Copyright (C) 2010-2025 The Catrobat Team - * () - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * An additional term exception under section 7 of the GNU Affero - * General Public License, version 3, is available at - * http://developer.catrobat.org/license_additional_term - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package org.catrobat.catroid.uiespresso.ui.fragment - -import android.content.Context -import android.preference.PreferenceManager -import androidx.test.core.app.ApplicationProvider -import androidx.test.espresso.Espresso.onView -import androidx.test.espresso.Espresso.openContextualActionModeOverflowMenu -import androidx.test.espresso.action.ViewActions.click -import androidx.test.espresso.assertion.ViewAssertions.matches -import androidx.test.espresso.matcher.ViewMatchers.isDisplayed -import androidx.test.espresso.matcher.ViewMatchers.withId -import androidx.test.espresso.matcher.ViewMatchers.withText -import androidx.test.ext.junit.runners.AndroidJUnit4 -import org.catrobat.catroid.R -import org.catrobat.catroid.common.Constants.CATROBAT_TERMS_OF_USE_ACCEPTED -import org.catrobat.catroid.common.DefaultProjectHandler -import org.catrobat.catroid.common.SharedPreferenceKeys.AGREED_TO_PRIVACY_POLICY_VERSION -import org.catrobat.catroid.test.utils.TestUtils -import org.catrobat.catroid.ui.MainMenuActivity -import org.catrobat.catroid.uiespresso.util.rules.BaseActivityTestRule -import org.junit.After -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith - -@RunWith(AndroidJUnit4::class) -class UploadUnmodifiedExampleProjectTest { - private var privacyPreferenceSetting: Int = 0 - private lateinit var applicationContext: Context - - @get:Rule - var baseActivityTestRule = BaseActivityTestRule( - MainMenuActivity::class.java, - false, - false - ) - - @Before - fun setUp() { - applicationContext = ApplicationProvider.getApplicationContext() - privacyPreferenceSetting = PreferenceManager - .getDefaultSharedPreferences(applicationContext) - .getInt(AGREED_TO_PRIVACY_POLICY_VERSION, 0) - - PreferenceManager.getDefaultSharedPreferences(applicationContext) - .edit() - .putInt(AGREED_TO_PRIVACY_POLICY_VERSION, CATROBAT_TERMS_OF_USE_ACCEPTED) - .commit() - - DefaultProjectHandler.createAndSaveDefaultProject(applicationContext) - - baseActivityTestRule.launchActivity(null) - } - - @After - fun tearDown() { - TestUtils.deleteProjects(javaClass.simpleName) - PreferenceManager.getDefaultSharedPreferences(applicationContext) - .edit() - .putInt(AGREED_TO_PRIVACY_POLICY_VERSION, privacyPreferenceSetting) - .commit() - } - - @Test - fun testUploadExampleProjectInProjectOptions() { - onView(withId(R.id.editProject)) - .perform(click()) - - openContextualActionModeOverflowMenu() - - onView(withText(R.string.project_options)) - .perform(click()) - - onView(withId(R.id.project_options_upload)) - .perform(click()) - - onView(withText(R.string.error_upload_default_project)) - .check(matches(isDisplayed())) - } - - @Test - fun testUploadExampleProjectInMainMenu() { - onView(withId(R.id.uploadProject)) - .perform(click()) - - onView(withText(R.string.error_upload_default_project)) - .check(matches(isDisplayed())) - } -} diff --git a/catroid/src/catroid/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/catroid/java/org/catrobat/catroid/common/FlavoredConstants.java index 4f7536c37a8..5a66e34e39c 100644 --- a/catroid/src/catroid/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/catroid/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -34,11 +34,11 @@ public final class FlavoredConstants { // Web: - public static final String BASE_URL_HTTPS = MAIN_URL_HTTPS + "/pocketcode/"; + public static final String BASE_URL_HTTPS = "https://catrobat.org/docs/"; public static final String BASE_UPLOAD_URL = UPLOAD_URL + "/pocketcode/"; - public static final String CATROBAT_HELP_URL = "https://catrob.at/help"; + public static final String CATROBAT_HELP_URL = "https://catrobat.org/docs/"; public static final String CATEGORY_URL = BASE_URL_HTTPS + "#home-projects__"; @@ -54,7 +54,7 @@ public final class FlavoredConstants { // TODO: Delete these and every usage, when the Catrobat share server completely closes // Deprecated Media Library: public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/"; - public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; + public static final String PRIVACY_POLICY_URL = "https://developer.catrobat.org/pages/legal/policies/privacy/"; // Media Library: public static final String CATROBAT_BASE_URL = "https://catrobat.org/"; diff --git a/catroid/src/createAtSchool/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/createAtSchool/java/org/catrobat/catroid/common/FlavoredConstants.java index eee15362a2e..ca99673ca67 100644 --- a/catroid/src/createAtSchool/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/createAtSchool/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -34,11 +34,11 @@ public final class FlavoredConstants { // Web: - public static final String BASE_URL_HTTPS = MAIN_URL_HTTPS + "/create@school/"; + public static final String BASE_URL_HTTPS = "https://catrobat.org/docs/"; public static final String BASE_UPLOAD_URL = UPLOAD_URL + "/create@school/"; - public static final String CATROBAT_HELP_URL = "https://catrob.at/help"; + public static final String CATROBAT_HELP_URL = "https://catrobat.org/docs/"; public static final String CATEGORY_URL = BASE_URL_HTTPS + "#home-projects__"; @@ -58,7 +58,7 @@ public final class FlavoredConstants { public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; - public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; + public static final String PRIVACY_POLICY_URL = "https://developer.catrobat.org/pages/legal/policies/privacy/"; private FlavoredConstants() { throw new AssertionError("No."); diff --git a/catroid/src/embroideryDesigner/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/embroideryDesigner/java/org/catrobat/catroid/common/FlavoredConstants.java index a850e002a86..57b50d625e1 100644 --- a/catroid/src/embroideryDesigner/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/embroideryDesigner/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -34,11 +34,11 @@ public final class FlavoredConstants { // Web: - public static final String BASE_URL_HTTPS = MAIN_URL_HTTPS + "/embroidery/"; + public static final String BASE_URL_HTTPS = "https://catrobat.org/docs/"; public static final String BASE_UPLOAD_URL = UPLOAD_URL + "/embroidery/"; - public static final String CATROBAT_HELP_URL = "https://catrob.at/CodedEmbroideryDocumentation"; + public static final String CATROBAT_HELP_URL = "https://catrobat.org/docs/"; public static final String CATEGORY_URL = BASE_URL_HTTPS + "#home-projects__"; @@ -58,7 +58,7 @@ public final class FlavoredConstants { public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; - public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; + public static final String PRIVACY_POLICY_URL = "https://developer.catrobat.org/pages/legal/policies/privacy/"; private FlavoredConstants() { throw new AssertionError("No."); diff --git a/catroid/src/lunaAndCat/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/lunaAndCat/java/org/catrobat/catroid/common/FlavoredConstants.java index c3d0219c239..25c4cdef695 100644 --- a/catroid/src/lunaAndCat/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/lunaAndCat/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -58,7 +58,7 @@ public final class FlavoredConstants { public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; - public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; + public static final String PRIVACY_POLICY_URL = "https://developer.catrobat.org/pages/legal/policies/privacy/"; private FlavoredConstants() { throw new AssertionError("No."); diff --git a/catroid/src/main/java/org/catrobat/catroid/common/Constants.java b/catroid/src/main/java/org/catrobat/catroid/common/Constants.java index e55c173dbae..461522f84c2 100644 --- a/catroid/src/main/java/org/catrobat/catroid/common/Constants.java +++ b/catroid/src/main/java/org/catrobat/catroid/common/Constants.java @@ -137,15 +137,15 @@ public final class Constants { public static final String SHARE_PROJECT_URL = BASE_URL_HTTPS + "/project/"; public static final String CATROBAT_ABOUT_URL = "https://www.catrobat.org/"; - public static final String CATROBAT_FORMULA_WIKI_URL = "https://wiki.catrobat.org/bin/view/Documentation/FormulaEditor"; - public static final String ABOUT_POCKETCODE_LICENSE_URL = "https://catrob.at/licenses"; - public static final String WEB_REQUEST_WIKI_URL = "https://catrob.at/webbricks"; - - public static final String CATROBAT_TERMS_OF_USE_URL = BASE_URL_HTTPS + "termsOfUse"; - public static final String CATROBAT_FUNCTIONS_WIKI_URL = CATROBAT_FORMULA_WIKI_URL + "/Functions/"; - public static final String CATROBAT_LOGIC_WIKI_URL = CATROBAT_FORMULA_WIKI_URL + "/Logic/"; - public static final String CATROBAT_SENSORS_WIKI_URL = CATROBAT_FORMULA_WIKI_URL + "/Sensors/"; - public static final String CATROBAT_OBJECT_WIKI_URL = CATROBAT_FORMULA_WIKI_URL + "/Properties/"; + public static final String CATROBAT_FORMULA_WIKI_URL = "https://catrobat.org/docs/"; + public static final String ABOUT_POCKETCODE_LICENSE_URL = "https://developer.catrobat.org/pages/legal/licenses/"; + public static final String WEB_REQUEST_WIKI_URL = "https://catrobat.org/docs/"; + + public static final String CATROBAT_TERMS_OF_USE_URL = "https://developer.catrobat.org/pages/legal/terms-of-use-and-service/"; + public static final String CATROBAT_FUNCTIONS_WIKI_URL = "https://catrobat.org/docs/"; + public static final String CATROBAT_LOGIC_WIKI_URL = "https://catrobat.org/docs/"; + public static final String CATROBAT_SENSORS_WIKI_URL = "https://catrobat.org/docs/"; + public static final String CATROBAT_OBJECT_WIKI_URL = "https://catrobat.org/docs/"; public static final String CATROBAT_DELETE_ACCOUNT_URL = BASE_URL_HTTPS + "profile/edit"; public static final String CATROBAT_TERMS_OF_USE_TOKEN_FLAVOR_URL = "?flavorName="; public static final String CATROBAT_TERMS_OF_USE_TOKEN_VERSION_URL = "&versionCode="; diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/MainMenuActivity.kt b/catroid/src/main/java/org/catrobat/catroid/ui/MainMenuActivity.kt index af17aec2123..d9bd397e6dc 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/MainMenuActivity.kt +++ b/catroid/src/main/java/org/catrobat/catroid/ui/MainMenuActivity.kt @@ -262,17 +262,6 @@ class MainMenuActivity : BaseCastActivity(), ProjectLoadListener { return super.onCreateOptionsMenu(menu) } - override fun onPrepareOptionsMenu(menu: Menu): Boolean { - menu.findItem(R.id.menu_login).isVisible = - !Utils.isUserLoggedIn(this) - menu.findItem(R.id.menu_logout).isVisible = - Utils.isUserLoggedIn(this) - if (!BuildConfig.FEATURE_SCRATCH_CONVERTER_ENABLED) { - menu.removeItem(R.id.menu_scratch_converter) - } - return true - } - override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.menu_rate_app -> if (Utils.checkIsNetworkAvailableAndShowErrorMessage(this)) { @@ -307,11 +296,6 @@ class MainMenuActivity : BaseCastActivity(), ProjectLoadListener { startActivity(Intent(this, ScratchConverterActivity::class.java)) } R.id.settings -> startActivity(Intent(this, SettingsActivity::class.java)) - R.id.menu_login -> startActivity(Intent(this, SignInActivity::class.java)) - R.id.menu_logout -> { - Utils.logoutUser(this) - ToastUtil.showSuccess(this, R.string.logout_successful) - } R.id.menu_help -> startActivity( Intent( Intent.ACTION_VIEW, diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/fragment/ProjectOptionsFragment.kt b/catroid/src/main/java/org/catrobat/catroid/ui/fragment/ProjectOptionsFragment.kt index d04023c489b..7fc70b5b0b1 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/fragment/ProjectOptionsFragment.kt +++ b/catroid/src/main/java/org/catrobat/catroid/ui/fragment/ProjectOptionsFragment.kt @@ -42,7 +42,6 @@ import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import com.google.android.material.chip.Chip -import com.google.android.material.snackbar.Snackbar import org.catrobat.catroid.ProjectManager import org.catrobat.catroid.R import org.catrobat.catroid.common.Constants @@ -55,16 +54,12 @@ import org.catrobat.catroid.io.StorageOperations import org.catrobat.catroid.io.XstreamSerializer import org.catrobat.catroid.io.asynctask.ProjectExportTask import org.catrobat.catroid.io.asynctask.loadProject -import org.catrobat.catroid.io.asynctask.ProjectSaver import org.catrobat.catroid.io.asynctask.renameProject import org.catrobat.catroid.io.asynctask.saveProjectSerial import org.catrobat.catroid.merge.NewProjectNameTextWatcher import org.catrobat.catroid.ui.BottomBar.hideBottomBar -import org.catrobat.catroid.ui.PROJECT_DIR -import org.catrobat.catroid.ui.ProjectUploadActivity import org.catrobat.catroid.ui.runtimepermissions.RequiresPermissionTask import org.catrobat.catroid.utils.ToastUtil -import org.catrobat.catroid.utils.Utils import org.catrobat.catroid.utils.notifications.StatusBarNotificationManager import org.koin.android.ext.android.inject import java.io.File @@ -100,7 +95,6 @@ class ProjectOptionsFragment : Fragment() { setupNotesAndCreditsInputLayout() addTags() setupProjectAspectRatio() - setupProjectUpload() setupProjectSaveExternal() setupProjectMoreDetails() setupProjectOptionDelete() @@ -158,12 +152,6 @@ class ProjectOptionsFragment : Fragment() { } } - private fun setupProjectUpload() { - binding.projectOptionsUpload.setOnClickListener { - projectUpload() - } - } - private fun setupProjectSaveExternal() { binding.projectOptionsSaveExternal.setOnClickListener { exportProject() @@ -282,29 +270,6 @@ class ProjectOptionsFragment : Fragment() { } } - fun projectUpload() { - val currentProject = projectManager.currentProject - ProjectSaver(currentProject, requireContext()) - .saveProjectAsync({ onSaveProjectComplete() }) - Utils.setLastUsedProjectName(requireContext(), currentProject.name) - } - - private fun onSaveProjectComplete() { - val currentProject = projectManager.currentProject - - if (Utils.isDefaultProject(currentProject, activity)) { - binding.root.apply { - Snackbar.make(binding.root, R.string.error_upload_default_project, Snackbar.LENGTH_LONG).show() - } - return - } - - val intent = Intent(requireContext(), ProjectUploadActivity::class.java) - intent.putExtra(PROJECT_DIR, currentProject.directory) - - startActivity(intent) - } - private fun exportProject() { saveProject() if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/MainMenuFragment.kt b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/MainMenuFragment.kt index 0c978ea3c08..cfdb62d4140 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/MainMenuFragment.kt +++ b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/MainMenuFragment.kt @@ -32,7 +32,6 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearSnapHelper import androidx.recyclerview.widget.PagerSnapHelper -import com.google.android.material.snackbar.Snackbar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -48,10 +47,8 @@ import org.catrobat.catroid.io.asynctask.ProjectLoader import org.catrobat.catroid.io.asynctask.ProjectLoader.ProjectLoadListener import org.catrobat.catroid.io.asynctask.loadProject import org.catrobat.catroid.stage.StageActivity -import org.catrobat.catroid.ui.PROJECT_DIR import org.catrobat.catroid.ui.ProjectActivity import org.catrobat.catroid.ui.ProjectListActivity -import org.catrobat.catroid.ui.ProjectUploadActivity import org.catrobat.catroid.ui.WebViewActivity import org.catrobat.catroid.ui.dialogs.NewProjectDialogFragment import org.catrobat.catroid.ui.recyclerview.CategoryTitleCallback @@ -116,7 +113,6 @@ class MainMenuFragment : Fragment(), setupViewVisibility() binding.editProject.setOnClickListener(this) - binding.uploadProject.setOnClickListener(this) binding.newProjectFloatingActionButton.setOnClickListener(this) binding.myProjectsTextView.setOnClickListener(this) binding.projectImageView.setOnClickListener(this) @@ -309,28 +305,6 @@ class MainMenuFragment : Fragment(), dialog.show(parentFragmentManager, NewProjectDialogFragment.TAG) } - R.id.uploadProject -> { - if (Utils.isDefaultProject(projectManager.currentProject, activity)) { - binding.root.apply { - Snackbar.make(binding.root, R.string.error_upload_default_project, Snackbar.LENGTH_LONG).show() - } - return - } - - viewModel.setIsLoading(true) - val intent = Intent(activity, ProjectUploadActivity::class.java) - .putExtra( - PROJECT_DIR, - File( - DEFAULT_ROOT_DIRECTORY, - FileMetaDataExtractor.encodeSpecialCharsForFileSystem( - Utils.getCurrentProjectName(activity) - ) - ) - ) - startActivity(intent) - } - R.id.playProject -> { viewModel.setIsLoading(true) StageActivity.handlePlayButton(projectManager, activity) diff --git a/catroid/src/main/res/layout/fragment_main_menu.xml b/catroid/src/main/res/layout/fragment_main_menu.xml index 21708307310..1042202be00 100644 --- a/catroid/src/main/res/layout/fragment_main_menu.xml +++ b/catroid/src/main/res/layout/fragment_main_menu.xml @@ -86,17 +86,6 @@ android:layout_marginEnd="12dp" android:src="@drawable/ic_play_circle" /> - - - \ No newline at end of file + diff --git a/catroid/src/main/res/layout/fragment_project_options.xml b/catroid/src/main/res/layout/fragment_project_options.xml index 5a1ab5f7205..726473f3d4d 100644 --- a/catroid/src/main/res/layout/fragment_project_options.xml +++ b/catroid/src/main/res/layout/fragment_project_options.xml @@ -170,17 +170,6 @@ android:orientation="vertical" android:showDividers="end"> - - diff --git a/catroid/src/main/res/values/strings.xml b/catroid/src/main/res/values/strings.xml index 8f1793c5bbb..70c3cc4da6b 100644 --- a/catroid/src/main/res/values/strings.xml +++ b/catroid/src/main/res/values/strings.xml @@ -111,9 +111,9 @@ Continue project New project - Projects on device + Projects Help - Catrobat community + Catrobat Upload project Play project diff --git a/catroid/src/mindstorms/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/mindstorms/java/org/catrobat/catroid/common/FlavoredConstants.java index 26a8f93f0b8..ea72bc49433 100644 --- a/catroid/src/mindstorms/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/mindstorms/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -58,7 +58,7 @@ public final class FlavoredConstants { public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; - public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; + public static final String PRIVACY_POLICY_URL = "https://developer.catrobat.org/pages/legal/policies/privacy/"; private FlavoredConstants() { throw new AssertionError("No."); } diff --git a/catroid/src/phiro/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/phiro/java/org/catrobat/catroid/common/FlavoredConstants.java index 55194bd75cf..661bc7c616e 100644 --- a/catroid/src/phiro/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/phiro/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -58,7 +58,7 @@ public final class FlavoredConstants { public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; - public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; + public static final String PRIVACY_POLICY_URL = "https://developer.catrobat.org/pages/legal/policies/privacy/"; private FlavoredConstants() { throw new AssertionError("No."); diff --git a/catroid/src/pocketCodeBeta/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/pocketCodeBeta/java/org/catrobat/catroid/common/FlavoredConstants.java index 0dcfd3c1ad6..0da7f4bb9ef 100644 --- a/catroid/src/pocketCodeBeta/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/pocketCodeBeta/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -58,7 +58,7 @@ public final class FlavoredConstants { public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; - public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; + public static final String PRIVACY_POLICY_URL = "https://developer.catrobat.org/pages/legal/policies/privacy/"; private FlavoredConstants() { throw new AssertionError("No."); diff --git a/catroid/src/standalone/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/standalone/java/org/catrobat/catroid/common/FlavoredConstants.java index 55194bd75cf..661bc7c616e 100644 --- a/catroid/src/standalone/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/standalone/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -58,7 +58,7 @@ public final class FlavoredConstants { public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; - public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; + public static final String PRIVACY_POLICY_URL = "https://developer.catrobat.org/pages/legal/policies/privacy/"; private FlavoredConstants() { throw new AssertionError("No.");