IDE-305 Fix URLs and remove obsolete buttons

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)

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) {

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/";

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.");

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.");

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.");

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=";

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,

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) {