diff --git a/ui/src/main/java/com/getbubblenow/android/activity/MainActivity.java b/ui/src/main/java/com/getbubblenow/android/activity/MainActivity.java index 7dbf611..9877f55 100644 --- a/ui/src/main/java/com/getbubblenow/android/activity/MainActivity.java +++ b/ui/src/main/java/com/getbubblenow/android/activity/MainActivity.java @@ -38,8 +38,9 @@ public class MainActivity extends AppCompatActivity { public static final int DISCONNECTED_TEXT_VIEW_BOTTOM_MARGIN = 90; public static final int CONNECTED_TEXT_VIEW_BOTTOM_MARGIN = 100; private static final String BASE_URL_PREFIX = "https://"; - private static final String BASE_URL_SUFFIX_MY_BUBBLE = ":1443/"; - private static final String BASE_URL_SUFFIX_ACCOUNT = ":1443/me"; + private static final String BASE_URL_SUFFIX_MY_BUBBLE = ":1443/appLogin?session="; + private static final String URI_MY_BUBBLE = "&uri=/"; + private static final String URI_ACCOUNT = "&uri=/me"; @Override protected void onCreate(Bundle savedInstanceState) { @@ -107,16 +108,18 @@ public class MainActivity extends AppCompatActivity { } private void showAccount() { + String token = mainViewModel.getToken(this); final String hostname = mainViewModel.getHostname(this); - final String url = BASE_URL_PREFIX + hostname + BASE_URL_SUFFIX_ACCOUNT; + final String url = BASE_URL_PREFIX + hostname + BASE_URL_SUFFIX_MY_BUBBLE + token + URI_ACCOUNT; final Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse(url)); startActivity(intent); } private void showMyBubble() { + String token = mainViewModel.getToken(this); final String hostname = mainViewModel.getHostname(this); - final String url = BASE_URL_PREFIX + hostname + BASE_URL_SUFFIX_MY_BUBBLE; + final String url = BASE_URL_PREFIX + hostname + BASE_URL_SUFFIX_MY_BUBBLE + token + URI_MY_BUBBLE; final Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse(url)); startActivity(intent); diff --git a/ui/src/main/java/com/getbubblenow/android/viewmodel/MainViewModel.java b/ui/src/main/java/com/getbubblenow/android/viewmodel/MainViewModel.java index 14e9c20..5e0bd44 100644 --- a/ui/src/main/java/com/getbubblenow/android/viewmodel/MainViewModel.java +++ b/ui/src/main/java/com/getbubblenow/android/viewmodel/MainViewModel.java @@ -52,4 +52,8 @@ public class MainViewModel extends ViewModel { public void deleteTunnel(Context context){ DataRepository.getRepositoryInstance().deleteTunnel(context); } + + public String getToken(Context context) { + return UserStore.getInstance(context).getToken(); + } }