diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java index a85e18d9a9..a54dfffcbb 100644 --- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java +++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java @@ -9,7 +9,7 @@ import java.net.URISyntaxException; public class HifiUtils { - public static final String METAVERSE_BASE_URL = "https://metaverse.highfidelity.com"; + public static final String METAVERSE_BASE_URL = "https://metaverse.vircadia.com/live"; private static HifiUtils instance; diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java index 28406d5986..436852be50 100644 --- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java +++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java @@ -41,7 +41,7 @@ public class LoginFragment extends Fragment private final String OAUTH_CLIENT_ID = BuildConfig.OAUTH_CLIENT_ID; private final String OAUTH_REDIRECT_URI = BuildConfig.OAUTH_REDIRECT_URI; - private final String OAUTH_AUTHORIZE_BASE_URL = "https://highfidelity.com/oauth/authorize"; + private final String OAUTH_AUTHORIZE_BASE_URL = "https://metaverse.vircadia.com/live/oauth/authorize"; private static final int OAUTH_AUTHORIZE_REQUEST = 1; private EditText mUsername; @@ -222,7 +222,7 @@ public class LoginFragment extends Fragment } private void onForgotPasswordClicked() { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://highfidelity.com/users/password/new")); + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://metaverse.vircadia.com/live/users/password/new")); startActivity(intent); } diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java index bd4df61ecf..6033151877 100644 --- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java +++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java @@ -28,7 +28,7 @@ import retrofit2.http.Query; public class EndpointUsersProvider implements UsersProvider { - public static final String BASE_URL = "https://metaverse.highfidelity.com/"; + public static final String BASE_URL = "https://metaverse.vircadia.com/live/"; private final Retrofit mRetrofit; private final EndpointUsersProviderService mEndpointUsersProviderService; diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java index 6033ce72cc..561313c5fe 100644 --- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java +++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java @@ -22,7 +22,7 @@ import retrofit2.http.Query; public class UserStoryDomainProvider implements DomainProvider { - public static final String BASE_URL = "https://metaverse.highfidelity.com/"; + public static final String BASE_URL = "https://metaverse.vircadia.com/live/"; private static final String INCLUDE_ACTIONS_FOR_PLACES = "concurrency"; private static final String INCLUDE_ACTIONS_FOR_FULL_SEARCH = "concurrency,announcements,snapshot"; diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java index f32227a31e..e669a6eff0 100644 --- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java +++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java @@ -15,8 +15,8 @@ import io.highfidelity.hifiinterface.HifiUtils; * available in an API */ public class DownloadProfileImageTask extends AsyncTask { - - private static final String BASE_PROFILE_URL = "https://highfidelity.com"; + // Note: This should now be available in the API, correct? + private static final String BASE_PROFILE_URL = "https://metaverse.vircadia.com/live"; private static final String TAG = "Interface"; private final DownloadProfileImageResultProcessor mResultProcessor; diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index f40141be32..5055b8efcd 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -636,6 +636,7 @@ Var Express ; figure out where to download installer slideshow images from StrCpy $0 "http://cdn.highfidelity.com/installer/slideshow" + ; Is this in use anymore? ${If} $CampaignName == "" StrCpy $0 "$0/default" diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 7c99bd2e46..42b15adefe 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -1888,7 +1888,7 @@ "name": "provider", "label": "Provider", "help": "OAuth provider URL.", - "default": "https://metaverse.highfidelity.com", + "default": "https://metaverse.vircadia.com/live", "advanced": true, "backup": false },