Skip to content

Commit

Permalink
Merge pull request #2932 from MerginMaps/removeOldServers
Browse files Browse the repository at this point in the history
Remove GUI handling old CE servers without workspaces
  • Loading branch information
PeterPetrik authored Dec 7, 2023
2 parents 89b3a70 + 0ceb9dc commit 2a37b1b
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 849 deletions.
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Building Mergin Maps mobile app from source - step by step
* [5. Building iOS](#5-building-ios)
* [6. Building macOS](#6-building-macos)
* [7. Building Windows](#7-building-windows)
* [8. Auto Testing](#9-auto-testing)
* [8. Auto Testing](#8-auto-testing)

# 1. Introduction

Expand Down Expand Up @@ -396,7 +396,7 @@ or you need some user with unlimited projects limit. First workspace from list i

now you need to set environment variables:
```
TEST_MERGIN_URL=test.dev.merginmaps.com
TEST_MERGIN_URL=https://test.dev.merginmaps.com/
TEST_API_USERNAME=test_mobileapp_dev
TEST_API_PASSWORD=<your_password>
```
Expand Down
6 changes: 1 addition & 5 deletions app/projectsmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ void ProjectsModel::onAuthChanged()
{
if ( !mBackend->userAuth() || !mBackend->userAuth()->hasAuthData() ) // user logged out, clear created and shared lists
{
if ( mModelType == CreatedProjectsModel || mModelType == SharedProjectsModel )
if ( mModelType == WorkspaceProjectsModel )
{
clearProjects();
}
Expand Down Expand Up @@ -586,10 +586,6 @@ QString ProjectsModel::modelTypeToFlag() const
{
switch ( mModelType )
{
case CreatedProjectsModel:
return QStringLiteral( "created" );
case SharedProjectsModel:
return QStringLiteral( "shared" );
case WorkspaceProjectsModel:
return QStringLiteral( "workspace" );
case PublicProjectsModel:
Expand Down
6 changes: 2 additions & 4 deletions app/projectsmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class LocalProjectsManager;
*
* Model can have different types that affect handling of the projects.
* - LocalProjectsModel always keeps all local projects and seek their mergin part when listProjectsByNameFinished
* - Created-, Shared-, and PublicProjectsModel does the opposite, keeps all mergin projects and seeks their local part in projects from LocalProjectsManager
* - Workspace-, and PublicProjectsModel does the opposite, keeps all mergin projects and seeks their local part in projects from LocalProjectsManager
* - EmptyProjectsModel is default state
*
* To avoid overriding of requests, model remembers last sent request ID and upon receiving signal from MerginAPI about listProjectsFinished, it firsts compares
Expand Down Expand Up @@ -68,15 +68,13 @@ class ProjectsModel : public QAbstractListModel
/**
* \brief The ProjectModelTypes enum:
* - LocalProjectsModel always keeps all local projects and seek their mergin part when listProjectsByNameFinished
* - Created-, Shared-, and PublicProjectsModel does the opposite, keeps all mergin projects and seeks their local part in projects from LocalProjectsManager
* - Workspace-, and PublicProjectsModel does the opposite, keeps all mergin projects and seeks their local part in projects from LocalProjectsManager
* - EmptyProjectsModel is default state
*/
enum ProjectModelTypes
{
EmptyProjectsModel = 0, // default, holding no projects ~ invalid model
LocalProjectsModel,
CreatedProjectsModel,
SharedProjectsModel,
PublicProjectsModel,
WorkspaceProjectsModel,
RecentProjectsModel
Expand Down
Loading

1 comment on commit 2a37b1b

@inputapp-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iOS - version 23.12.493011 just submitted!

Please sign in to comment.