Merge pull request #767 from kasenvr/fix/3-0-wrap-up

Fix/3 0 wrap up
vircadia · Sep 29, 2020 · f7f8ea1 · f7f8ea1
2 parents ac64860 + 8cd1294
commit f7f8ea1
Show file tree

Hide file tree

Showing 8 changed files with 2,053 additions and 3,490 deletions.
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
@@ -9,7 +9,7 @@
 
 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/...id/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java b/...id/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 @@ private void hideKeyboard() {
     }
 
     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/...interface/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java b/...interface/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java
@@ -28,7 +28,7 @@
 
 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/...terface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java b/...terface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java
@@ -22,7 +22,7 @@
 
 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/.../interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java b/.../interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java
@@ -15,8 +15,8 @@
  * available in an API
  */
 public class DownloadProfileImageTask extends AsyncTask<String, Void, String> {
-
-    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
@@ -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
@@ -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
         },