());
+ }
+ });
+
+}
+
JNIEXPORT void JNICALL
Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeBeforeEnterBackground(JNIEnv *env, jobject obj) {
AndroidHelper::instance().notifyBeforeEnterBackground();
@@ -355,5 +546,11 @@ JNIEXPORT void Java_io_highfidelity_hifiinterface_WebViewActivity_nativeProcessU
AndroidHelper::instance().processURL(QString::fromUtf8(nativeString));
}
+JNIEXPORT void JNICALL
+Java_io_highfidelity_hifiinterface_receiver_HeadsetStateReceiver_notifyHeadsetOn(JNIEnv *env,
+ jobject instance,
+ jboolean pluggedIn) {
+ AndroidHelper::instance().notifyHeadsetOn(pluggedIn);
+}
}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java b/android/app/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java
index f92cd0a385..a85e18d9a9 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java
@@ -64,4 +64,10 @@ public class HifiUtils {
public native String protocolVersionSignature();
+ public native boolean isUserLoggedIn();
+
+ public native void updateHifiSetting(String group, String key, boolean value);
+ public native boolean getHifiSettingBoolean(String group, String key, boolean defaultValue);
+
+ public native boolean isKeepingLoggedIn();
}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
index f161783d6a..50aea59663 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
@@ -13,6 +13,7 @@ package io.highfidelity.hifiinterface;
import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
@@ -38,8 +39,10 @@ import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import io.highfidelity.hifiinterface.fragment.WebViewFragment;
+import io.highfidelity.hifiinterface.receiver.HeadsetStateReceiver;
/*import com.google.vr.cardboard.DisplaySynchronizer;
import com.google.vr.cardboard.DisplayUtils;
@@ -55,6 +58,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
private static final int NORMAL_DPI = 160;
private Vibrator mVibrator;
+ private HeadsetStateReceiver headsetStateReceiver;
//public static native void handleHifiURL(String hifiURLString);
private native long nativeOnCreate(InterfaceActivity instance, AssetManager assetManager);
@@ -65,13 +69,14 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
private native void nativeEnterBackground();
private native void nativeEnterForeground();
private native long nativeOnExitVr();
+ private native void nativeInitAfterAppLoaded();
private AssetManager assetManager;
private static boolean inVrMode;
private boolean nativeEnterBackgroundCallEnqueued = false;
- private SlidingDrawer webSlidingDrawer;
+ private SlidingDrawer mWebSlidingDrawer;
// private GvrApi gvrApi;
// Opaque native pointer to the Application C++ object.
// This object is owned by the InterfaceActivity instance and passed to the native methods.
@@ -111,17 +116,6 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
//nativeGvrApi =
nativeOnCreate(this, assetManager /*, gvrApi.getNativeGvrContext()*/);
- Point size = new Point();
- getWindowManager().getDefaultDisplay().getRealSize(size);
-
- try {
- PackageInfo pInfo = this.getPackageManager().getPackageInfo(getPackageName(), 0);
- String version = pInfo.versionName;
-// setAppVersion(version);
- } catch (PackageManager.NameNotFoundException e) {
- Log.e("GVR", "Error getting application version", e);
- }
-
final View rootView = getWindow().getDecorView().findViewById(android.R.id.content);
// This is a workaround to hide the menu bar when the virtual keyboard is shown from Qt
@@ -132,25 +126,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
});
startActivity(new Intent(this, SplashActivity.class));
mVibrator = (Vibrator) this.getSystemService(VIBRATOR_SERVICE);
-
- FrameLayout mainLayout = findViewById(android.R.id.content);
- LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- webSlidingDrawer = (SlidingDrawer) inflater.inflate(R.layout.web_drawer, mainLayout, false);
- QtLayout qtLayout = (QtLayout) mainLayout.getChildAt(0);
- QtLayout.LayoutParams layoutParams = new QtLayout.LayoutParams(webSlidingDrawer.getLayoutParams());
- webSlidingDrawer.setOnDrawerCloseListener(() -> {
- WebViewFragment webViewFragment = (WebViewFragment) getFragmentManager().findFragmentByTag("webViewFragment");
- webViewFragment.close();
- });
- int widthPx = Math.max(size.x, size.y);
- int heightPx = Math.min(size.x, size.y);
-
- layoutParams.x = (int) (widthPx - WEB_DRAWER_RIGHT_MARGIN * getResources().getDisplayMetrics().xdpi / NORMAL_DPI);
- layoutParams.y = (int) (heightPx - WEB_DRAWER_BOTTOM_MARGIN * getResources().getDisplayMetrics().ydpi / NORMAL_DPI);
-
- layoutParams.resolveLayoutDirection(View.LAYOUT_DIRECTION_RTL);
- qtLayout.addView(webSlidingDrawer, layoutParams);
- webSlidingDrawer.setVisibility(View.GONE);
+ headsetStateReceiver = new HeadsetStateReceiver();
}
@Override
@@ -161,6 +137,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
} else {
nativeEnterBackground();
}
+ unregisterReceiver(headsetStateReceiver);
//gvrApi.pauseTracking();
}
@@ -183,6 +160,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
nativeEnterForeground();
surfacesWorkaround();
keepInterfaceRunning = false;
+ registerReceiver(headsetStateReceiver, new IntentFilter(Intent.ACTION_HEADSET_PLUG));
//gvrApi.resumeTracking();
}
@@ -280,14 +258,47 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
if (intent.hasExtra(DOMAIN_URL)) {
- webSlidingDrawer.setVisibility(View.GONE);
+ hideWebDrawer();
nativeGotoUrl(intent.getStringExtra(DOMAIN_URL));
} else if (intent.hasExtra(EXTRA_GOTO_USERNAME)) {
- webSlidingDrawer.setVisibility(View.GONE);
+ hideWebDrawer();
nativeGoToUser(intent.getStringExtra(EXTRA_GOTO_USERNAME));
}
}
+ private void hideWebDrawer() {
+ if (mWebSlidingDrawer != null) {
+ mWebSlidingDrawer.setVisibility(View.GONE);
+ }
+ }
+
+ public void showWebDrawer() {
+ if (mWebSlidingDrawer == null) {
+ FrameLayout mainLayout = findViewById(android.R.id.content);
+ LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ QtLayout qtLayout = (QtLayout) mainLayout.getChildAt(0);
+ mWebSlidingDrawer = (SlidingDrawer) inflater.inflate(R.layout.web_drawer, mainLayout, false);
+
+ QtLayout.LayoutParams layoutParams = new QtLayout.LayoutParams(mWebSlidingDrawer.getLayoutParams());
+ mWebSlidingDrawer.setOnDrawerCloseListener(() -> {
+ WebViewFragment webViewFragment = (WebViewFragment) getFragmentManager().findFragmentByTag("webViewFragment");
+ webViewFragment.close();
+ });
+
+ Point size = new Point();
+ getWindowManager().getDefaultDisplay().getRealSize(size);
+ int widthPx = Math.max(size.x, size.y);
+ int heightPx = Math.min(size.x, size.y);
+
+ layoutParams.x = (int) (widthPx - WEB_DRAWER_RIGHT_MARGIN * getResources().getDisplayMetrics().xdpi / NORMAL_DPI);
+ layoutParams.y = (int) (heightPx - WEB_DRAWER_BOTTOM_MARGIN * getResources().getDisplayMetrics().ydpi / NORMAL_DPI);
+
+ layoutParams.resolveLayoutDirection(View.LAYOUT_DIRECTION_RTL);
+ qtLayout.addView(mWebSlidingDrawer, layoutParams);
+ }
+ mWebSlidingDrawer.setVisibility(View.VISIBLE);
+ }
+
public void openAndroidActivity(String activityName, boolean backToScene) {
openAndroidActivity(activityName, backToScene, null);
}
@@ -296,29 +307,37 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
switch (activityName) {
case "Home":
case "Privacy Policy":
- case "Login": {
nativeBeforeEnterBackground();
Intent intent = new Intent(this, MainActivity.class);
intent.putExtra(MainActivity.EXTRA_FRAGMENT, activityName);
intent.putExtra(MainActivity.EXTRA_BACK_TO_SCENE, backToScene);
startActivity(intent);
break;
- }
+ case "Login":
+ nativeBeforeEnterBackground();
+ Intent loginIntent = new Intent(this, LoginMenuActivity.class);
+ loginIntent.putExtra(LoginMenuActivity.EXTRA_BACK_TO_SCENE, backToScene);
+ loginIntent.putExtra(LoginMenuActivity.EXTRA_BACK_ON_SKIP, true);
+ if (args != null && args.containsKey(DOMAIN_URL)) {
+ loginIntent.putExtra(LoginMenuActivity.EXTRA_DOMAIN_URL, (String) args.get(DOMAIN_URL));
+ }
+ startActivity(loginIntent);
+ break;
case "WebView":
runOnUiThread(() -> {
- webSlidingDrawer.setVisibility(View.VISIBLE);
- if (!webSlidingDrawer.isOpened()) {
- webSlidingDrawer.animateOpen();
+ showWebDrawer();
+ if (!mWebSlidingDrawer.isOpened()) {
+ mWebSlidingDrawer.animateOpen();
}
if (args != null && args.containsKey(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL)) {
WebViewFragment webViewFragment = (WebViewFragment) getFragmentManager().findFragmentByTag("webViewFragment");
webViewFragment.loadUrl((String) args.get(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL), true);
webViewFragment.setToolbarVisible(true);
webViewFragment.setCloseAction(() -> {
- if (webSlidingDrawer.isOpened()) {
- webSlidingDrawer.animateClose();
+ if (mWebSlidingDrawer.isOpened()) {
+ mWebSlidingDrawer.animateClose();
}
- webSlidingDrawer.setVisibility(View.GONE);
+ hideWebDrawer();
});
}
});
@@ -335,6 +354,9 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
if (nativeEnterBackgroundCallEnqueued) {
nativeEnterBackground();
}
+ runOnUiThread(() -> {
+ nativeInitAfterAppLoaded();
+ });
}
public void performHapticFeedback(int duration) {
@@ -361,4 +383,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
public void onExpand() {
keepInterfaceRunning = true;
}
+
+ @Override
+ public void onOAuthAuthorizeCallback(Uri uri) { }
}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/LoginMenuActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/LoginMenuActivity.java
new file mode 100644
index 0000000000..5cb196249d
--- /dev/null
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/LoginMenuActivity.java
@@ -0,0 +1,210 @@
+package io.highfidelity.hifiinterface;
+
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import io.highfidelity.hifiinterface.fragment.LoginFragment;
+import io.highfidelity.hifiinterface.fragment.OnBackPressedListener;
+import io.highfidelity.hifiinterface.fragment.SignupFragment;
+import io.highfidelity.hifiinterface.fragment.StartMenuFragment;
+
+public class LoginMenuActivity extends AppCompatActivity
+ implements StartMenuFragment.StartMenuInteractionListener,
+ LoginFragment.OnLoginInteractionListener,
+ SignupFragment.OnSignupInteractionListener {
+
+ /**
+ * Set EXTRA_FINISH_ON_BACK to finish the app when back button is pressed
+ */
+ public static final String EXTRA_FINISH_ON_BACK = "finishOnBack";
+
+ /**
+ * Set EXTRA_BACK_TO_SCENE to back to the scene
+ */
+ public static final String EXTRA_BACK_TO_SCENE = "backToScene";
+
+ /**
+ * Set EXTRA_BACK_ON_SKIP to finish this activity when skip button is pressed
+ */
+ public static final String EXTRA_BACK_ON_SKIP = "backOnSkip";
+
+ public static final String EXTRA_DOMAIN_URL = "url";
+
+ private boolean finishOnBack;
+ private boolean backToScene;
+ private boolean backOnSkip;
+ private String domainUrlToBack;
+
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_encourage_login);
+
+ finishOnBack = getIntent().getBooleanExtra(EXTRA_FINISH_ON_BACK, false);
+ backToScene = getIntent().getBooleanExtra(EXTRA_BACK_TO_SCENE, false);
+ domainUrlToBack = getIntent().getStringExtra(EXTRA_DOMAIN_URL);
+ backOnSkip = getIntent().getBooleanExtra(EXTRA_BACK_ON_SKIP, false);
+
+ if (savedInstanceState != null) {
+ finishOnBack = savedInstanceState.getBoolean(EXTRA_FINISH_ON_BACK, false);
+ backToScene = savedInstanceState.getBoolean(EXTRA_BACK_TO_SCENE, false);
+ backOnSkip = savedInstanceState.getBoolean(EXTRA_BACK_ON_SKIP, false);
+ domainUrlToBack = savedInstanceState.getString(EXTRA_DOMAIN_URL);
+ }
+
+ loadMenuFragment();
+ }
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ outState.putBoolean(EXTRA_FINISH_ON_BACK, finishOnBack);
+ outState.putBoolean(EXTRA_BACK_TO_SCENE, backToScene);
+ outState.putString(EXTRA_DOMAIN_URL, domainUrlToBack);
+ }
+
+ @Override
+ protected void onRestoreInstanceState(Bundle savedInstanceState) {
+ super.onRestoreInstanceState(savedInstanceState);
+ finishOnBack = savedInstanceState.getBoolean(EXTRA_FINISH_ON_BACK, false);
+ backToScene = savedInstanceState.getBoolean(EXTRA_BACK_TO_SCENE, false);
+ backOnSkip = savedInstanceState.getBoolean(EXTRA_BACK_ON_SKIP, false);
+ domainUrlToBack = savedInstanceState.getString(EXTRA_DOMAIN_URL);
+ }
+
+ private void loadMenuFragment() {
+ FragmentManager fragmentManager = getFragmentManager();
+ FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+ Fragment fragment = StartMenuFragment.newInstance();
+ fragmentTransaction.replace(R.id.content_frame, fragment);
+ fragmentTransaction.addToBackStack(fragment.toString());
+ fragmentTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+ fragmentTransaction.commit();
+ hideStatusBar();
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ hideStatusBar();
+ }
+
+ private void hideStatusBar() {
+ View decorView = getWindow().getDecorView();
+ // Hide the status bar.
+ int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
+ decorView.setSystemUiVisibility(uiOptions);
+ }
+
+ @Override
+ public void onSignupButtonClicked() {
+ loadSignupFragment();
+ }
+
+ @Override
+ public void onLoginButtonClicked() {
+ loadLoginFragment(false);
+ }
+
+ @Override
+ public void onSkipLoginClicked() {
+ if (backOnSkip) {
+ onBackPressed();
+ } else {
+ loadMainActivity();
+ }
+ }
+
+ @Override
+ public void onSteamLoginButtonClicked() {
+ loadLoginFragment(true);
+ }
+
+ private void loadSignupFragment() {
+ FragmentManager fragmentManager = getFragmentManager();
+ FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+ Fragment fragment = SignupFragment.newInstance();
+ String tag = getString(R.string.tagFragmentSignup);
+ fragmentTransaction.replace(R.id.content_frame, fragment, tag);
+ fragmentTransaction.addToBackStack(tag);
+ fragmentTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+ fragmentTransaction.commit();
+ hideStatusBar();
+ }
+
+ private void loadLoginFragment(boolean useOauth) {
+ FragmentManager fragmentManager = getFragmentManager();
+ FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+ Fragment fragment = LoginFragment.newInstance(useOauth);
+ String tag = getString(R.string.tagFragmentLogin);
+ fragmentTransaction.replace(R.id.content_frame, fragment, tag);
+ fragmentTransaction.addToBackStack(tag);
+ fragmentTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+ fragmentTransaction.commit();
+ hideStatusBar();
+ }
+
+ @Override
+ public void onLoginCompleted() {
+ loadMainActivity();
+ }
+
+ @Override
+ public void onCancelLogin() {
+ getFragmentManager().popBackStack();
+ }
+
+ @Override
+ public void onCancelSignup() {
+ getFragmentManager().popBackStack();
+ }
+
+ private void loadMainActivity() {
+ finish();
+ if (backToScene) {
+ backToScene = false;
+ goToDomain(domainUrlToBack != null? domainUrlToBack : "");
+ } else {
+ startActivity(new Intent(this, MainActivity.class));
+ }
+ }
+
+ private void goToDomain(String domainUrl) {
+ Intent intent = new Intent(this, InterfaceActivity.class);
+ intent.putExtra(InterfaceActivity.DOMAIN_URL, domainUrl);
+ finish();
+ intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+ startActivity(intent);
+ }
+
+
+ @Override
+ public void onSignupCompleted() {
+ loadMainActivity();
+ }
+
+ @Override
+ public void onBackPressed() {
+ FragmentManager fm = getFragmentManager();
+ int index = fm.getBackStackEntryCount() - 1;
+ if (index > 0) {
+ FragmentManager.BackStackEntry backEntry = fm.getBackStackEntryAt(index);
+ String tag = backEntry.getName();
+ Fragment topFragment = getFragmentManager().findFragmentByTag(tag);
+ if (!(topFragment instanceof OnBackPressedListener) ||
+ !((OnBackPressedListener) topFragment).doBack()) {
+ super.onBackPressed();
+ }
+ } else if (finishOnBack){
+ finishAffinity();
+ } else {
+ finish();
+ }
+ }
+}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
index db6f0fca24..e17b530f1c 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
@@ -1,5 +1,6 @@
package io.highfidelity.hifiinterface;
+import android.app.Activity;
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
@@ -31,12 +32,12 @@ import com.squareup.picasso.Picasso;
import io.highfidelity.hifiinterface.fragment.FriendsFragment;
import io.highfidelity.hifiinterface.fragment.HomeFragment;
-import io.highfidelity.hifiinterface.fragment.LoginFragment;
import io.highfidelity.hifiinterface.fragment.PolicyFragment;
+import io.highfidelity.hifiinterface.fragment.SettingsFragment;
+import io.highfidelity.hifiinterface.fragment.SignupFragment;
import io.highfidelity.hifiinterface.task.DownloadProfileImageTask;
public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener,
- LoginFragment.OnLoginInteractionListener,
HomeFragment.OnHomeInteractionListener,
FriendsFragment.OnHomeInteractionListener {
@@ -44,12 +45,13 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
public static final String DEFAULT_FRAGMENT = "Home";
public static final String EXTRA_FRAGMENT = "fragment";
public static final String EXTRA_BACK_TO_SCENE = "backToScene";
+ public static final String EXTRA_BACK_TO_URL = "url";
private String TAG = "HighFidelity";
- public native boolean nativeIsLoggedIn();
- public native void nativeLogout();
- public native String nativeGetDisplayName();
+ public native void logout();
+ public native void setUsernameChangedListener(Activity usernameChangedListener);
+ public native String getUsername();
private DrawerLayout mDrawerLayout;
private NavigationView mNavigationView;
@@ -61,6 +63,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
private MenuItem mPeopleMenuItem;
private boolean backToScene;
+ private String backToUrl;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -80,6 +83,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
mPeopleMenuItem = mNavigationView.getMenu().findItem(R.id.action_people);
+ updateDebugMenu(mNavigationView.getMenu());
+
Toolbar toolbar = findViewById(R.id.toolbar);
toolbar.setTitleTextAppearance(this, R.style.HomeActionBarTitleStyle);
setSupportActionBar(toolbar);
@@ -102,17 +107,23 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
loadFragment(DEFAULT_FRAGMENT);
}
- if (getIntent().hasExtra(EXTRA_BACK_TO_SCENE)) {
- backToScene = getIntent().getBooleanExtra(EXTRA_BACK_TO_SCENE, false);
+ backToScene = getIntent().getBooleanExtra(EXTRA_BACK_TO_SCENE, false);
+ backToUrl = getIntent().getStringExtra(EXTRA_BACK_TO_URL);
+ }
+ }
+
+ private void updateDebugMenu(Menu menu) {
+ if (BuildConfig.DEBUG) {
+ for (int i=0; i < menu.size(); i++) {
+ if (menu.getItem(i).getItemId() == R.id.action_debug_settings) {
+ menu.getItem(i).setVisible(true);
+ }
}
}
}
private void loadFragment(String fragment) {
switch (fragment) {
- case "Login":
- loadLoginFragment();
- break;
case "Home":
loadHomeFragment(true);
break;
@@ -130,28 +141,35 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
private void loadHomeFragment(boolean addToBackStack) {
Fragment fragment = HomeFragment.newInstance();
- loadFragment(fragment, getString(R.string.home), getString(R.string.tagFragmentHome), addToBackStack);
+ loadFragment(fragment, getString(R.string.home), getString(R.string.tagFragmentHome), addToBackStack, true);
}
- private void loadLoginFragment() {
- Fragment fragment = LoginFragment.newInstance();
-
- loadFragment(fragment, getString(R.string.login), getString(R.string.tagFragmentLogin), true);
+ private void startLoginMenuActivity() {
+ Intent intent = new Intent(this, LoginMenuActivity.class);
+ intent.putExtra(LoginMenuActivity.EXTRA_BACK_ON_SKIP, true);
+ startActivity(intent);
}
private void loadPrivacyPolicyFragment() {
Fragment fragment = PolicyFragment.newInstance();
- loadFragment(fragment, getString(R.string.privacyPolicy), getString(R.string.tagFragmentPolicy), true);
+ loadFragment(fragment, getString(R.string.privacyPolicy), getString(R.string.tagFragmentPolicy), true, true);
}
private void loadPeopleFragment() {
Fragment fragment = FriendsFragment.newInstance();
- loadFragment(fragment, getString(R.string.people), getString(R.string.tagFragmentPeople), true);
+ loadFragment(fragment, getString(R.string.people), getString(R.string.tagFragmentPeople), true, true);
}
- private void loadFragment(Fragment fragment, String title, String tag, boolean addToBackStack) {
+ private void loadSettingsFragment() {
+ SettingsFragment fragment = SettingsFragment.newInstance();
+
+ loadFragment(fragment, getString(R.string.settings), getString(R.string.tagSettings), true, true);
+ }
+
+
+ private void loadFragment(Fragment newFragment, String title, String tag, boolean addToBackStack, boolean goBackUntilHome) {
FragmentManager fragmentManager = getFragmentManager();
// check if it's the same fragment
@@ -163,17 +181,19 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
return; // cancel as we are already in that fragment
}
- // go back until first transaction
- int backStackEntryCount = fragmentManager.getBackStackEntryCount();
- for (int i = 0; i < backStackEntryCount - 1; i++) {
- fragmentManager.popBackStackImmediate();
+ if (goBackUntilHome) {
+ // go back until first transaction
+ int backStackEntryCount = fragmentManager.getBackStackEntryCount();
+ for (int i = 0; i < backStackEntryCount - 1; i++) {
+ fragmentManager.popBackStackImmediate();
+ }
}
// this case is when we wanted to go home.. rollback already did that!
// But asking for a new Home fragment makes it easier to have an updated list so we let it to continue
FragmentTransaction ft = fragmentManager.beginTransaction();
- ft.replace(R.id.content_frame, fragment, tag);
+ ft.replace(R.id.content_frame, newFragment, tag);
if (addToBackStack) {
ft.addToBackStack(title);
@@ -185,7 +205,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
private void updateLoginMenu() {
- if (nativeIsLoggedIn()) {
+ if (HifiUtils.getInstance().isUserLoggedIn()) {
mLoginPanel.setVisibility(View.GONE);
mProfilePanel.setVisibility(View.VISIBLE);
mLogoutOption.setVisibility(View.VISIBLE);
@@ -201,7 +221,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
}
private void updateProfileHeader() {
- updateProfileHeader(nativeGetDisplayName());
+ updateProfileHeader(getUsername());
}
private void updateProfileHeader(String username) {
if (!username.isEmpty()) {
@@ -241,6 +261,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
case R.id.action_people:
loadPeopleFragment();
return true;
+ case R.id.action_debug_settings:
+ loadSettingsFragment();
+ return true;
}
return false;
}
@@ -248,15 +271,22 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
@Override
protected void onStart() {
super.onStart();
+ setUsernameChangedListener(this);
updateLoginMenu();
}
+ @Override
+ protected void onStop() {
+ super.onStop();
+ setUsernameChangedListener(null);
+ }
+
public void onLoginClicked(View view) {
- loadLoginFragment();
+ startLoginMenuActivity();
}
public void onLogoutClicked(View view) {
- nativeLogout();
+ logout();
updateLoginMenu();
exitLoggedInFragment();
@@ -278,7 +308,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
}
private void goToLastLocation() {
- goToDomain("");
+ goToDomain(backToUrl != null? backToUrl : "");
}
private void goToDomain(String domainUrl) {
@@ -297,16 +327,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
startActivity(intent);
}
- @Override
- public void onLoginCompleted() {
- loadHomeFragment(false);
- updateLoginMenu();
- if (backToScene) {
- backToScene = false;
- goToLastLocation();
- }
- }
-
public void handleUsernameChanged(String username) {
runOnUiThread(() -> updateProfileHeader(username));
}
@@ -351,7 +371,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
public void onBackPressed() {
// if a fragment needs to internally manage back presses..
FragmentManager fm = getFragmentManager();
- Log.d("[BACK]", "getBackStackEntryCount " + fm.getBackStackEntryCount());
Fragment friendsFragment = fm.findFragmentByTag(getString(R.string.tagFragmentPeople));
if (friendsFragment != null && friendsFragment instanceof FriendsFragment) {
if (((FriendsFragment) friendsFragment).onBackPressed()) {
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java
index e0aa967aaa..bb42467ace 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java
@@ -3,7 +3,6 @@ package io.highfidelity.hifiinterface;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import android.os.Handler;
import android.view.View;
public class SplashActivity extends Activity {
@@ -37,7 +36,13 @@ public class SplashActivity extends Activity {
}
public void onAppLoadedComplete() {
- startActivity(new Intent(this, MainActivity.class));
+ if (HifiUtils.getInstance().isUserLoggedIn()) {
+ startActivity(new Intent(this, MainActivity.class));
+ } else {
+ Intent menuIntent = new Intent(this, LoginMenuActivity.class);
+ menuIntent.putExtra(LoginMenuActivity.EXTRA_FINISH_ON_BACK, true);
+ startActivity(menuIntent);
+ }
SplashActivity.this.finish();
}
}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/WebViewActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/WebViewActivity.java
index 5d65bcad51..e906c4b734 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/WebViewActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/WebViewActivity.java
@@ -28,11 +28,18 @@ import java.net.MalformedURLException;
import java.net.URL;
import io.highfidelity.hifiinterface.fragment.WebViewFragment;
+import io.highfidelity.hifiinterface.fragment.WebViewFragment.OnWebViewInteractionListener;
-public class WebViewActivity extends Activity implements WebViewFragment.OnWebViewInteractionListener {
+public class WebViewActivity extends Activity implements OnWebViewInteractionListener {
public static final String WEB_VIEW_ACTIVITY_EXTRA_URL = "url";
+ public static final String WEB_VIEW_ACTIVITY_EXTRA_CLEAR_COOKIES = "clear_cookies";
+ public static final String RESULT_OAUTH_CODE = "code";
+ public static final String RESULT_OAUTH_STATE = "state";
+
private static final String FRAGMENT_TAG = "WebViewActivity_WebFragment";
+ private static final String OAUTH_CODE = "code";
+ private static final String OAUTH_STATE = "state";
private native void nativeProcessURL(String url);
@@ -47,14 +54,15 @@ public class WebViewActivity extends Activity implements WebViewFragment.OnWebVi
mActionBar = getActionBar();
mActionBar.setDisplayHomeAsUpEnabled(true);
- loadWebViewFragment(getIntent().getStringExtra(WEB_VIEW_ACTIVITY_EXTRA_URL));
+ loadWebViewFragment(getIntent().getStringExtra(WEB_VIEW_ACTIVITY_EXTRA_URL), getIntent().getBooleanExtra(WEB_VIEW_ACTIVITY_EXTRA_CLEAR_COOKIES, false));
}
- private void loadWebViewFragment(String url) {
+ private void loadWebViewFragment(String url, boolean clearCookies) {
WebViewFragment fragment = WebViewFragment.newInstance();
Bundle bundle = new Bundle();
bundle.putString(WebViewFragment.URL, url);
bundle.putBoolean(WebViewFragment.TOOLBAR_VISIBLE, false);
+ bundle.putBoolean(WebViewFragment.CLEAR_COOKIES, clearCookies);
fragment.setArguments(bundle);
FragmentManager fragmentManager = getFragmentManager();
FragmentTransaction ft = fragmentManager.beginTransaction();
@@ -131,4 +139,13 @@ public class WebViewActivity extends Activity implements WebViewFragment.OnWebVi
@Override
public void onExpand() { }
+ @Override
+ public void onOAuthAuthorizeCallback(Uri uri) {
+ Intent result = new Intent();
+ result.putExtra(RESULT_OAUTH_CODE, uri.getQueryParameter(OAUTH_CODE));
+ result.putExtra(RESULT_OAUTH_STATE, uri.getQueryParameter(OAUTH_STATE));
+ setResult(Activity.RESULT_OK, result);
+ finish();
+ }
+
}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/FriendsFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/FriendsFragment.java
index 2a008d7950..e19a9c5a7a 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/FriendsFragment.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/FriendsFragment.java
@@ -23,8 +23,6 @@ import io.highfidelity.hifiinterface.view.UserListAdapter;
public class FriendsFragment extends Fragment {
- public native boolean nativeIsLoggedIn();
-
public native String nativeGetAccessToken();
private RecyclerView mUsersView;
@@ -98,13 +96,17 @@ public class FriendsFragment extends Fragment {
mUsersAdapter.setListener(new UserListAdapter.AdapterListener() {
@Override
- public void onEmptyAdapter() {
- mSwipeRefreshLayout.setRefreshing(false);
+ public void onEmptyAdapter(boolean shouldStopRefreshing) {
+ if (shouldStopRefreshing) {
+ mSwipeRefreshLayout.setRefreshing(false);
+ }
}
@Override
- public void onNonEmptyAdapter() {
- mSwipeRefreshLayout.setRefreshing(false);
+ public void onNonEmptyAdapter(boolean shouldStopRefreshing) {
+ if (shouldStopRefreshing) {
+ mSwipeRefreshLayout.setRefreshing(false);
+ }
}
@Override
@@ -115,6 +117,8 @@ public class FriendsFragment extends Fragment {
mUsersView.setAdapter(mUsersAdapter);
+ mUsersAdapter.startLoad();
+
mSlidingUpPanelLayout.setFadeOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/HomeFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/HomeFragment.java
index 7bd373cf1d..86b8625cfe 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/HomeFragment.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/HomeFragment.java
@@ -76,18 +76,22 @@ public class HomeFragment extends Fragment {
});
mDomainAdapter.setListener(new DomainAdapter.AdapterListener() {
@Override
- public void onEmptyAdapter() {
+ public void onEmptyAdapter(boolean shouldStopRefreshing) {
searchNoResultsView.setText(R.string.search_no_results);
searchNoResultsView.setVisibility(View.VISIBLE);
mDomainsView.setVisibility(View.GONE);
- mSwipeRefreshLayout.setRefreshing(false);
+ if (shouldStopRefreshing) {
+ mSwipeRefreshLayout.setRefreshing(false);
+ }
}
@Override
- public void onNonEmptyAdapter() {
+ public void onNonEmptyAdapter(boolean shouldStopRefreshing) {
searchNoResultsView.setVisibility(View.GONE);
mDomainsView.setVisibility(View.VISIBLE);
- mSwipeRefreshLayout.setRefreshing(false);
+ if (shouldStopRefreshing) {
+ mSwipeRefreshLayout.setRefreshing(false);
+ }
}
@Override
@@ -96,11 +100,20 @@ public class HomeFragment extends Fragment {
}
});
mDomainsView.setAdapter(mDomainAdapter);
+ mDomainAdapter.startLoad();
mSearchView = rootView.findViewById(R.id.searchView);
mSearchIconView = rootView.findViewById(R.id.search_mag_icon);
mClearSearch = rootView.findViewById(R.id.search_clear);
+ getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+
+ return rootView;
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
mSearchView.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
@@ -142,10 +155,6 @@ public class HomeFragment extends Fragment {
mDomainAdapter.loadDomains(mSearchView.getText().toString(), true);
}
});
-
- getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-
- return rootView;
}
@Override
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
index f29c237ed7..28406d5986 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
@@ -2,36 +2,65 @@ package io.highfidelity.hifiinterface.fragment;
import android.app.Activity;
import android.app.Fragment;
-import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
+import android.support.annotation.Nullable;
import android.util.Log;
+import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
+import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.TextView;
-import io.highfidelity.hifiinterface.R;
+import org.qtproject.qt5.android.QtNative;
-public class LoginFragment extends Fragment {
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Random;
+
+import io.highfidelity.hifiinterface.BuildConfig;
+import io.highfidelity.hifiinterface.HifiUtils;
+import io.highfidelity.hifiinterface.R;
+import io.highfidelity.hifiinterface.WebViewActivity;
+
+import static org.qtproject.qt5.android.QtActivityDelegate.ApplicationActive;
+import static org.qtproject.qt5.android.QtActivityDelegate.ApplicationInactive;
+
+public class LoginFragment extends Fragment
+ implements OnBackPressedListener {
+
+ private static final String ARG_USE_OAUTH = "use_oauth";
+ private static final String TAG = "Interface";
+
+ 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 static final int OAUTH_AUTHORIZE_REQUEST = 1;
private EditText mUsername;
private EditText mPassword;
private TextView mError;
- private TextView mForgotPassword;
private Button mLoginButton;
+ private CheckBox mKeepMeLoggedInCheckbox;
+ private ViewGroup mLoginForm;
+ private ViewGroup mLoggingInFrame;
+ private ViewGroup mLoggedInFrame;
+ private boolean mLoginInProgress;
+ private boolean mLoginSuccess;
+ private boolean mUseOauth;
+ private String mOauthState;
- private ProgressDialog mDialog;
+ public native void login(String username, String password, boolean keepLoggedIn);
+ private native void retrieveAccessToken(String authCode, String clientId, String clientSecret, String redirectUri);
- public native void nativeLogin(String username, String password, Activity usernameChangedListener);
+ public native void cancelLogin();
private LoginFragment.OnLoginInteractionListener mListener;
@@ -39,11 +68,22 @@ public class LoginFragment extends Fragment {
// Required empty public constructor
}
- public static LoginFragment newInstance() {
+ public static LoginFragment newInstance(boolean useOauth) {
LoginFragment fragment = new LoginFragment();
+ Bundle args = new Bundle();
+ args.putBoolean(ARG_USE_OAUTH, useOauth);
+ fragment.setArguments(args);
return fragment;
}
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (getArguments() != null) {
+ mUseOauth = getArguments().getBoolean(ARG_USE_OAUTH, false);
+ }
+ }
+
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
@@ -53,58 +93,29 @@ public class LoginFragment extends Fragment {
mPassword = rootView.findViewById(R.id.password);
mError = rootView.findViewById(R.id.error);
mLoginButton = rootView.findViewById(R.id.loginButton);
- mForgotPassword = rootView.findViewById(R.id.forgotPassword);
+ mLoginForm = rootView.findViewById(R.id.loginForm);
+ mLoggingInFrame = rootView.findViewById(R.id.loggingInFrame);
+ mLoggedInFrame = rootView.findViewById(R.id.loggedInFrame);
+ mKeepMeLoggedInCheckbox = rootView.findViewById(R.id.keepMeLoggedIn);
- mUsername.addTextChangedListener(new TextWatcher() {
- boolean ignoreNextChange = false;
- boolean hadBlankSpace = false;
- @Override
- public void beforeTextChanged(CharSequence charSequence, int start, int count, int after) {
- hadBlankSpace = charSequence.length() > 0 && charSequence.charAt(charSequence.length()-1) == ' ';
- }
+ rootView.findViewById(R.id.forgotPassword).setOnClickListener(view -> onForgotPasswordClicked());
- @Override
- public void onTextChanged(CharSequence charSequence, int start, int count, int after) {
+ rootView.findViewById(R.id.cancel).setOnClickListener(view -> onCancelLogin());
- }
+ rootView.findViewById(R.id.getStarted).setOnClickListener(view -> onGetStartedClicked());
- @Override
- public void afterTextChanged(Editable editable) {
- if (!ignoreNextChange) {
- ignoreNextChange = true;
- boolean spaceFound = false;
- for (int i = 0; i < editable.length(); i++) {
- if (editable.charAt(i) == ' ') {
- spaceFound=true;
- editable.delete(i, i + 1);
- i--;
- }
- }
+ mLoginButton.setOnClickListener(view -> onLoginButtonClicked());
- if (hadBlankSpace && !spaceFound && editable.length() > 0) {
- editable.delete(editable.length()-1, editable.length());
- }
+ rootView.findViewById(R.id.takeMeInWorld).setOnClickListener(view -> skipLogin());
+ mPassword.setOnEditorActionListener((textView, actionId, keyEvent) -> onPasswordEditorAction(textView, actionId, keyEvent));
- editable.append(' ');
- ignoreNextChange = false;
- }
+ mKeepMeLoggedInCheckbox.setChecked(HifiUtils.getInstance().isKeepingLoggedIn());
- }
- });
-
-
- mLoginButton.setOnClickListener(view -> login());
-
- mForgotPassword.setOnClickListener(view -> forgotPassword());
-
- mPassword.setOnEditorActionListener(
- (textView, actionId, keyEvent) -> {
- if (actionId == EditorInfo.IME_ACTION_DONE) {
- mLoginButton.performClick();
- return true;
- }
- return false;
- });
+ if (mUseOauth) {
+ openWebForAuthorization();
+ } else {
+ showLoginForm();
+ }
return rootView;
}
@@ -125,14 +136,67 @@ public class LoginFragment extends Fragment {
mListener = null;
}
+ @Override
+ public void onResume() {
+ super.onResume();
+ // This hack intends to keep Qt threads running even after the app comes from background
+ QtNative.setApplicationState(ApplicationActive);
+ }
+
@Override
public void onStop() {
super.onStop();
- cancelActivityIndicator();
+ // Leave the Qt app paused
+ QtNative.setApplicationState(ApplicationInactive);
hideKeyboard();
}
- public void login() {
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode == OAUTH_AUTHORIZE_REQUEST) {
+ if (resultCode == Activity.RESULT_OK) {
+ String authCode = data.getStringExtra(WebViewActivity.RESULT_OAUTH_CODE);
+ String state = data.getStringExtra(WebViewActivity.RESULT_OAUTH_STATE);
+ if (state != null && state.equals(mOauthState) && mListener != null) {
+ mOauthState = null;
+ showActivityIndicator();
+ mLoginInProgress = true;
+ retrieveAccessToken(authCode, BuildConfig.OAUTH_CLIENT_ID, BuildConfig.OAUTH_CLIENT_SECRET, BuildConfig.OAUTH_REDIRECT_URI);
+ }
+ } else {
+ onCancelLogin();
+ }
+ }
+
+ }
+
+ private void onCancelLogin() {
+ if (mListener != null) {
+ mListener.onCancelLogin();
+ }
+ }
+
+ private boolean onPasswordEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
+ if (actionId == EditorInfo.IME_ACTION_DONE) {
+ mLoginButton.performClick();
+ return true;
+ }
+ return false;
+ }
+
+ private void skipLogin() {
+ if (mListener != null) {
+ mListener.onSkipLoginClicked();
+ }
+ }
+
+ private void onGetStartedClicked() {
+ if (mListener != null) {
+ mListener.onLoginCompleted();
+ }
+ }
+
+ public void onLoginButtonClicked() {
String username = mUsername.getText().toString().trim();
String password = mPassword.getText().toString();
hideKeyboard();
@@ -142,7 +206,10 @@ public class LoginFragment extends Fragment {
mLoginButton.setEnabled(false);
hideError();
showActivityIndicator();
- nativeLogin(username, password, getActivity());
+ mLoginInProgress = true;
+ mLoginSuccess = false;
+ boolean keepUserLoggedIn = mKeepMeLoggedInCheckbox.isChecked();
+ login(username, password, keepUserLoggedIn);
}
}
@@ -154,25 +221,32 @@ public class LoginFragment extends Fragment {
}
}
- private void forgotPassword() {
+ private void onForgotPasswordClicked() {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://highfidelity.com/users/password/new"));
startActivity(intent);
}
private void showActivityIndicator() {
- if (mDialog == null) {
- mDialog = new ProgressDialog(getContext());
- }
- mDialog.setMessage(getString(R.string.logging_in));
- mDialog.setCancelable(false);
- mDialog.show();
+ mLoginForm.setVisibility(View.GONE);
+ mLoggedInFrame.setVisibility(View.GONE);
+ mLoggingInFrame.setVisibility(View.VISIBLE);
+ mLoggingInFrame.bringToFront();
}
- private void cancelActivityIndicator() {
- if (mDialog != null) {
- mDialog.cancel();
- }
+ private void showLoginForm() {
+ mLoggingInFrame.setVisibility(View.GONE);
+ mLoggedInFrame.setVisibility(View.GONE);
+ mLoginForm.setVisibility(View.VISIBLE);
+ mLoginForm.bringToFront();
}
+
+ private void showLoggedInMessage() {
+ mLoginForm.setVisibility(View.GONE);
+ mLoggingInFrame.setVisibility(View.GONE);
+ mLoggedInFrame.setVisibility(View.VISIBLE);
+ mLoggedInFrame.bringToFront();
+ }
+
private void showError(String error) {
mError.setText(error);
mError.setVisibility(View.VISIBLE);
@@ -184,22 +258,71 @@ public class LoginFragment extends Fragment {
}
public void handleLoginCompleted(boolean success) {
- Log.d("[LOGIN]", "handleLoginCompleted " + success);
+ mLoginInProgress = false;
getActivity().runOnUiThread(() -> {
mLoginButton.setEnabled(true);
- cancelActivityIndicator();
if (success) {
- if (mListener != null) {
- mListener.onLoginCompleted();
- }
+ mLoginSuccess = true;
+ showLoggedInMessage();
} else {
- showError(getString(R.string.login_username_or_password_incorrect));
+ if (!mUseOauth) {
+ showLoginForm();
+ showError(getString(R.string.login_username_or_password_incorrect));
+ } else {
+ openWebForAuthorization();
+ }
}
});
}
+ @Override
+ public boolean doBack() {
+ if (mLoginInProgress) {
+ cancelLogin();
+ showLoginForm();
+ mLoginInProgress = false;
+ mLoginButton.setEnabled(true);
+ return true;
+ } else if (mLoginSuccess) {
+ onGetStartedClicked();
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ private void updateOauthState() {
+ // as we only use oauth for steam that's ok for now
+ mOauthState = "steam-" + Long.toString(new Random().nextLong());
+ }
+
+ private String buildAuthorizeUrl() {
+ StringBuilder sb = new StringBuilder(OAUTH_AUTHORIZE_BASE_URL);
+ sb.append("?client_id=").append(OAUTH_CLIENT_ID);
+ try {
+ String redirectUri = URLEncoder.encode(OAUTH_REDIRECT_URI, "utf-8");
+ sb.append("&redirect_uri=").append(redirectUri);
+ } catch (UnsupportedEncodingException e) {
+ Log.e(TAG, "Cannot build oauth autorization url", e);
+ }
+ sb.append("&response_type=code&scope=owner");
+ sb.append("&state=").append(mOauthState);
+ return sb.toString();
+ }
+
+ private void openWebForAuthorization() {
+ Intent openUrlIntent = new Intent(getActivity(), WebViewActivity.class);
+ updateOauthState();
+ openUrlIntent.putExtra(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL, buildAuthorizeUrl());
+ openUrlIntent.putExtra(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_CLEAR_COOKIES, true);
+ startActivityForResult(openUrlIntent, OAUTH_AUTHORIZE_REQUEST);
+ }
+
+
public interface OnLoginInteractionListener {
void onLoginCompleted();
+ void onCancelLogin();
+ void onSkipLoginClicked();
}
}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/OnBackPressedListener.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/OnBackPressedListener.java
new file mode 100644
index 0000000000..c160138cea
--- /dev/null
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/OnBackPressedListener.java
@@ -0,0 +1,11 @@
+package io.highfidelity.hifiinterface.fragment;
+
+public interface OnBackPressedListener {
+
+ /**
+ * Processes the back pressed event and returns true if it was managed by this Fragment
+ * @return
+ */
+ boolean doBack();
+
+}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SettingsFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SettingsFragment.java
new file mode 100644
index 0000000000..e32dc3b996
--- /dev/null
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SettingsFragment.java
@@ -0,0 +1,64 @@
+package io.highfidelity.hifiinterface.fragment;
+
+import android.content.SharedPreferences;
+import android.media.audiofx.AcousticEchoCanceler;
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+
+import io.highfidelity.hifiinterface.HifiUtils;
+import io.highfidelity.hifiinterface.R;
+
+public class SettingsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
+
+ private final String HIFI_SETTINGS_ANDROID_GROUP = "Android";
+ private final String HIFI_SETTINGS_AEC_KEY = "aec";
+ private final String PREFERENCE_KEY_AEC = "aec";
+
+ private final boolean DEFAULT_AEC_ENABLED = true;
+
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ addPreferencesFromResource(R.xml.settings);
+ boolean aecAvailable = AcousticEchoCanceler.isAvailable();
+ PreferenceManager.setDefaultValues(getContext(), R.xml.settings, false);
+
+ if (!aecAvailable) {
+ findPreference(PREFERENCE_KEY_AEC).setEnabled(false);
+ HifiUtils.getInstance().updateHifiSetting(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, false);
+ }
+
+ getPreferenceScreen().getSharedPreferences().edit().putBoolean(PREFERENCE_KEY_AEC,
+ aecAvailable && HifiUtils.getInstance().getHifiSettingBoolean(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, DEFAULT_AEC_ENABLED)).commit();
+ }
+
+ public static SettingsFragment newInstance() {
+ SettingsFragment fragment = new SettingsFragment();
+ return fragment;
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
+ }
+
+ @Override
+ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+ switch (key) {
+ case "aec":
+ HifiUtils.getInstance().updateHifiSetting(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, sharedPreferences.getBoolean(key, false));
+ break;
+ default:
+ break;
+ }
+ }
+}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java
new file mode 100644
index 0000000000..a11ae31fa1
--- /dev/null
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java
@@ -0,0 +1,260 @@
+package io.highfidelity.hifiinterface.fragment;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import org.qtproject.qt5.android.QtNative;
+
+import io.highfidelity.hifiinterface.HifiUtils;
+import io.highfidelity.hifiinterface.R;
+
+import static org.qtproject.qt5.android.QtActivityDelegate.ApplicationActive;
+import static org.qtproject.qt5.android.QtActivityDelegate.ApplicationInactive;
+
+public class SignupFragment extends Fragment
+ implements OnBackPressedListener {
+
+ private EditText mEmail;
+ private EditText mUsername;
+ private EditText mPassword;
+ private TextView mError;
+ private TextView mActivityText;
+ private Button mSignupButton;
+ private CheckBox mKeepMeLoggedInCheckbox;
+
+ private ViewGroup mSignupForm;
+ private ViewGroup mLoggingInFrame;
+ private ViewGroup mLoggedInFrame;
+
+ private boolean mLoginInProgress;
+ private boolean mSignupInProgress;
+ private boolean mSignupSuccess;
+
+ public native void signup(String email, String username, String password); // move to SignupFragment
+ public native void cancelSignup();
+ public native void login(String username, String password, boolean keepLoggedIn);
+ public native void cancelLogin();
+
+ private SignupFragment.OnSignupInteractionListener mListener;
+
+ public SignupFragment() {
+ // Required empty public constructor
+ }
+
+ public static SignupFragment newInstance() {
+ SignupFragment fragment = new SignupFragment();
+ return fragment;
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ View rootView = inflater.inflate(R.layout.fragment_signup, container, false);
+
+ mEmail = rootView.findViewById(R.id.email);
+ mUsername = rootView.findViewById(R.id.username);
+ mPassword = rootView.findViewById(R.id.password);
+ mError = rootView.findViewById(R.id.error);
+ mSignupButton = rootView.findViewById(R.id.signupButton);
+ mActivityText = rootView.findViewById(R.id.activityText);
+ mKeepMeLoggedInCheckbox = rootView.findViewById(R.id.keepMeLoggedIn);
+
+ mSignupForm = rootView.findViewById(R.id.signupForm);
+ mLoggedInFrame = rootView.findViewById(R.id.loggedInFrame);
+ mLoggingInFrame = rootView.findViewById(R.id.loggingInFrame);
+
+ rootView.findViewById(R.id.cancel).setOnClickListener(view -> onCancelSignup());
+
+ mSignupButton.setOnClickListener(view -> signup());
+
+ rootView.findViewById(R.id.getStarted).setOnClickListener(view -> onGetStartedClicked());
+
+ mPassword.setOnEditorActionListener((textView, actionId, keyEvent) -> onPasswordEditorAction(textView, actionId, keyEvent));
+
+ mKeepMeLoggedInCheckbox.setChecked(HifiUtils.getInstance().isKeepingLoggedIn());
+
+ return rootView;
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ if (context instanceof OnSignupInteractionListener) {
+ mListener = (OnSignupInteractionListener) context;
+ } else {
+ throw new RuntimeException(context.toString()
+ + " must implement OnSignupInteractionListener");
+ }
+ }
+
+ @Override
+ public void onDetach() {
+ super.onDetach();
+ mListener = null;
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ // This hack intends to keep Qt threads running even after the app comes from background
+ QtNative.setApplicationState(ApplicationActive);
+ }
+
+ @Override
+ public void onStop() {
+ super.onStop();
+ // Leave the Qt app paused
+ QtNative.setApplicationState(ApplicationInactive);
+ hideKeyboard();
+ }
+
+ private boolean onPasswordEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
+ if (actionId == EditorInfo.IME_ACTION_DONE) {
+ mSignupButton.performClick();
+ return true;
+ }
+ return false;
+ }
+
+ private void onCancelSignup() {
+ if (mListener != null) {
+ mListener.onCancelSignup();
+ }
+ }
+
+ public void signup() {
+ String email = mEmail.getText().toString().trim();
+ String username = mUsername.getText().toString().trim();
+ String password = mPassword.getText().toString();
+ hideKeyboard();
+ if (email.isEmpty() || username.isEmpty() || password.isEmpty()) {
+ showError(getString(R.string.signup_email_username_or_password_incorrect));
+ } else {
+ mSignupButton.setEnabled(false);
+ hideError();
+ mActivityText.setText(R.string.creating_account);
+ showActivityIndicator();
+ mSignupInProgress = true;
+ mSignupSuccess = false;
+ signup(email, username, password);
+ }
+ }
+
+ private void hideKeyboard() {
+ View view = getActivity().getCurrentFocus();
+ if (view != null) {
+ InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+ }
+ }
+
+ private void showActivityIndicator() {
+ mSignupForm.setVisibility(View.GONE);
+ mLoggedInFrame.setVisibility(View.GONE);
+ mLoggingInFrame.setVisibility(View.VISIBLE);
+ }
+
+ private void showLoggedInMessage() {
+ mSignupForm.setVisibility(View.GONE);
+ mLoggingInFrame.setVisibility(View.GONE);
+ mLoggedInFrame.setVisibility(View.VISIBLE);
+ }
+
+ private void showSignupForm() {
+ mLoggingInFrame.setVisibility(View.GONE);
+ mLoggedInFrame.setVisibility(View.GONE);
+ mSignupForm.setVisibility(View.VISIBLE);
+ }
+ private void showError(String error) {
+ mError.setText(error);
+ mError.setVisibility(View.VISIBLE);
+ }
+
+ private void hideError() {
+ mError.setText("");
+ mError.setVisibility(View.INVISIBLE);
+ }
+
+ public interface OnSignupInteractionListener {
+ void onSignupCompleted();
+ void onCancelSignup();
+ }
+
+ private void onGetStartedClicked() {
+ if (mListener != null) {
+ mListener.onSignupCompleted();
+ }
+ }
+
+
+ public void handleSignupCompleted() {
+ mSignupInProgress = false;
+ String username = mUsername.getText().toString().trim();
+ String password = mPassword.getText().toString();
+ getActivity().runOnUiThread(() -> {
+ mActivityText.setText(R.string.logging_in);
+ });
+ mLoginInProgress = true;
+ boolean keepUserLoggedIn = mKeepMeLoggedInCheckbox.isChecked();
+ login(username, password, keepUserLoggedIn);
+ }
+
+ public void handleSignupFailed(String error) {
+ mSignupInProgress = false;
+ getActivity().runOnUiThread(() -> {
+ mSignupButton.setEnabled(true);
+ showSignupForm();
+ mError.setText(error);
+ mError.setVisibility(View.VISIBLE);
+ });
+ }
+
+ public void handleLoginCompleted(boolean success) {
+ mLoginInProgress = false;
+ getActivity().runOnUiThread(() -> {
+ mSignupButton.setEnabled(true);
+ if (success) {
+ mSignupSuccess = true;
+ showLoggedInMessage();
+ } else {
+ // Registration was successful but login failed.
+ // Let the user to login manually
+ mListener.onCancelSignup();
+ showSignupForm();
+ }
+ });
+ }
+
+ @Override
+ public boolean doBack() {
+ if (mSignupInProgress) {
+ cancelSignup();
+ } else if (mLoginInProgress) {
+ cancelLogin();
+ }
+
+ if (mSignupInProgress || mLoginInProgress) {
+ showSignupForm();
+ mLoginInProgress = false;
+ mSignupInProgress = false;
+ mSignupButton.setEnabled(true);
+ return true;
+ } else if (mSignupSuccess) {
+ onGetStartedClicked();
+ return true;
+ } else {
+ return false;
+ }
+ }
+}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/StartMenuFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/StartMenuFragment.java
new file mode 100644
index 0000000000..fe77991962
--- /dev/null
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/StartMenuFragment.java
@@ -0,0 +1,93 @@
+package io.highfidelity.hifiinterface.fragment;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import io.highfidelity.hifiinterface.R;
+
+public class StartMenuFragment extends Fragment {
+
+ private String TAG = "HighFidelity";
+ private StartMenuInteractionListener mListener;
+
+ public StartMenuFragment() {
+ // Required empty public constructor
+ }
+
+ public static StartMenuFragment newInstance() {
+ StartMenuFragment fragment = new StartMenuFragment();
+ return fragment;
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ View rootView = inflater.inflate(R.layout.fragment_login_menu, container, false);
+ rootView.findViewById(R.id.signupButton).setOnClickListener(view -> {
+ if (mListener != null) {
+ mListener.onSignupButtonClicked();
+ }
+ });
+
+ rootView.findViewById(R.id.loginButton).setOnClickListener(view -> {
+ if (mListener != null) {
+ mListener.onLoginButtonClicked();
+ }
+ });
+
+ rootView.findViewById(R.id.steamLoginButton).setOnClickListener(view -> {
+ if (mListener != null) {
+ mListener.onSteamLoginButtonClicked();
+ }
+ });
+
+ rootView.findViewById(R.id.takeMeInWorld).setOnClickListener(view -> {
+ if (mListener != null) {
+ mListener.onSkipLoginClicked();
+ }
+ });
+
+
+
+ return rootView;
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ if (context instanceof StartMenuInteractionListener) {
+ mListener = (StartMenuInteractionListener) context;
+ } else {
+ throw new RuntimeException(context.toString()
+ + " must implement StartMenuInteractionListener");
+ }
+ }
+
+ @Override
+ public void onDetach() {
+ super.onDetach();
+ mListener = null;
+ }
+
+ /**
+ * This interface must be implemented by activities that contain this
+ * fragment to allow an interaction in this fragment to be communicated
+ * to the activity and potentially other fragments contained in that
+ * activity.
+ *
+ * See the Android Training lesson Communicating with Other Fragments for more information.
+ */
+ public interface StartMenuInteractionListener {
+ void onSignupButtonClicked();
+ void onLoginButtonClicked();
+ void onSkipLoginClicked();
+ void onSteamLoginButtonClicked();
+ }
+}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java
index 2d887d5a19..3614fe47e4 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java
@@ -4,9 +4,11 @@ import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
+import android.net.Uri;
import android.net.http.SslError;
import android.os.Bundle;
import android.os.Handler;
+import android.text.TextUtils;
import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@@ -14,6 +16,7 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.AlphaAnimation;
+import android.webkit.CookieManager;
import android.webkit.SslErrorHandler;
import android.webkit.WebChromeClient;
import android.webkit.WebResourceError;
@@ -25,6 +28,7 @@ import android.webkit.WebViewClient;
import android.widget.ProgressBar;
import android.widget.Toast;
+import io.highfidelity.hifiinterface.BuildConfig;
import io.highfidelity.hifiinterface.R;
import io.highfidelity.hifiinterface.WebViewActivity;
@@ -32,6 +36,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
public static final String URL = "url";
public static final String TOOLBAR_VISIBLE = "toolbar_visible";
+ public static final String CLEAR_COOKIES = "clear_cookies";
private static final long DELAY_HIDE_TOOLBAR_MILLIS = 3000;
private static final long FADE_OUT_DURATION = 2000;
@@ -41,6 +46,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
private ProgressBar mProgressBar;
private String mUrl;
private boolean mToolbarVisible;
+ private boolean mClearCookies;
private OnWebViewInteractionListener mListener;
private Runnable mCloseAction;
@@ -170,6 +176,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
if (getArguments() != null) {
mUrl = getArguments().getString(URL);
mToolbarVisible = getArguments().getBoolean(TOOLBAR_VISIBLE);
+ mClearCookies = getArguments().getBoolean(CLEAR_COOKIES);
}
}
@@ -179,6 +186,10 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
View rootView = inflater.inflate(R.layout.fragment_web_view, container, false);
mProgressBar = rootView.findViewById(R.id.toolbarProgressBar);
myWebView = rootView.findViewById(R.id.web_view);
+ if (mClearCookies) {
+ CookieManager.getInstance().removeAllCookies(null);
+ }
+
mHandler = new Handler();
gestureDetector = new GestureDetector(this);
gestureDetector.setOnDoubleTapListener(new GestureDetector.OnDoubleTapListener() {
@@ -251,6 +262,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
void onWebLoaded(String url, SafenessLevel safenessLevel);
void onTitleReceived(String title);
void onExpand();
+ void onOAuthAuthorizeCallback(Uri uri);
}
@@ -320,6 +332,18 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
super.onLoadResource(view, url);
}
}
+
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+ if (!TextUtils.isEmpty(BuildConfig.OAUTH_REDIRECT_URI) &&
+ request.getUrl().toString().startsWith(BuildConfig.OAUTH_REDIRECT_URI)) {
+ if (mListener != null) {
+ mListener.onOAuthAuthorizeCallback(request.getUrl());
+ }
+ return true;
+ }
+ return super.shouldOverrideUrlLoading(view, request);
+ }
}
class HiFiWebChromeClient extends WebChromeClient {
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/receiver/HeadsetStateReceiver.java b/android/app/src/main/java/io/highfidelity/hifiinterface/receiver/HeadsetStateReceiver.java
new file mode 100644
index 0000000000..5645912d73
--- /dev/null
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/receiver/HeadsetStateReceiver.java
@@ -0,0 +1,18 @@
+package io.highfidelity.hifiinterface.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.util.Log;
+
+public class HeadsetStateReceiver extends BroadcastReceiver {
+
+ private native void notifyHeadsetOn(boolean pluggedIn);
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+ notifyHeadsetOn(audioManager.isWiredHeadsetOn());
+ }
+}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java b/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java
index 71d634e9ea..78251ac4a4 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java
@@ -12,6 +12,7 @@ import android.widget.TextView;
import com.squareup.picasso.Picasso;
+import java.util.Arrays;
import java.util.List;
import io.highfidelity.hifiinterface.R;
@@ -36,19 +37,41 @@ public class DomainAdapter extends RecyclerView.Adapter 0) {
+ mDomains = Arrays.copyOf(DOMAINS_TMP_CACHE, DOMAINS_TMP_CACHE.length);
+ notifyDataSetChanged();
+ if (mAdapterListener != null) {
+ if (mDomains.length == 0) {
+ mAdapterListener.onEmptyAdapter(false);
+ } else {
+ mAdapterListener.onNonEmptyAdapter(false);
+ }
+ }
+ }
+ }
+ }
+
public void loadDomains(String filterText, boolean forceRefresh) {
domainProvider.retrieve(filterText, new DomainProvider.DomainCallback() {
@Override
@@ -60,13 +83,18 @@ public class DomainAdapter extends RecyclerView.Adapter USERS_TMP_CACHE;
+
public UserListAdapter(Context c, UsersProvider usersProvider) {
mContext = c;
mInflater = LayoutInflater.from(mContext);
mProvider = usersProvider;
- loadUsers();
}
public void setListener(AdapterListener adapterListener) {
mAdapterListener = adapterListener;
}
+ public void startLoad() {
+ useTmpCachedUsers();
+ loadUsers();
+ }
+
+ private void useTmpCachedUsers() {
+ synchronized (this) {
+ if (USERS_TMP_CACHE != null && USERS_TMP_CACHE.size() > 0) {
+ mUsers = new ArrayList<>(USERS_TMP_CACHE.size());
+ mUsers.addAll(USERS_TMP_CACHE);
+ notifyDataSetChanged();
+ if (mAdapterListener != null) {
+ if (mUsers.isEmpty()) {
+ mAdapterListener.onEmptyAdapter(false);
+ } else {
+ mAdapterListener.onNonEmptyAdapter(false);
+ }
+ }
+ }
+ }
+ }
+
public void loadUsers() {
mProvider.retrieve(new UsersProvider.UsersCallback() {
@Override
public void retrieveOk(List users) {
mUsers = new ArrayList<>(users);
notifyDataSetChanged();
- if (mAdapterListener != null) {
- if (mUsers.isEmpty()) {
- mAdapterListener.onEmptyAdapter();
- } else {
- mAdapterListener.onNonEmptyAdapter();
+
+ synchronized (this) {
+ USERS_TMP_CACHE = new ArrayList<>(mUsers.size());
+ USERS_TMP_CACHE.addAll(mUsers);
+
+ if (mAdapterListener != null) {
+ if (mUsers.isEmpty()) {
+ mAdapterListener.onEmptyAdapter(true);
+ } else {
+ mAdapterListener.onNonEmptyAdapter(true);
+ }
}
}
}
@@ -240,8 +269,9 @@ public class UserListAdapter extends RecyclerView.Adapter
diff --git a/android/app/src/main/res/drawable/ic_eye_noshow.xml b/android/app/src/main/res/drawable/ic_eye_noshow.xml
new file mode 100644
index 0000000000..1d5304afac
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_eye_noshow.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_eye_show.xml b/android/app/src/main/res/drawable/ic_eye_show.xml
new file mode 100644
index 0000000000..273ecc8339
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_eye_show.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/android/app/src/main/res/drawable/ic_right_arrow.xml b/android/app/src/main/res/drawable/ic_right_arrow.xml
new file mode 100644
index 0000000000..e35d1a2733
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_right_arrow.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_steam.xml b/android/app/src/main/res/drawable/ic_steam.xml
new file mode 100644
index 0000000000..9b739c1f73
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_steam.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/rounded_button.xml b/android/app/src/main/res/drawable/rounded_button_color1.xml
similarity index 100%
rename from android/app/src/main/res/drawable/rounded_button.xml
rename to android/app/src/main/res/drawable/rounded_button_color1.xml
diff --git a/android/app/src/main/res/drawable/rounded_button_color3.xml b/android/app/src/main/res/drawable/rounded_button_color3.xml
new file mode 100644
index 0000000000..6230885b30
--- /dev/null
+++ b/android/app/src/main/res/drawable/rounded_button_color3.xml
@@ -0,0 +1,24 @@
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/rounded_button_color4.xml b/android/app/src/main/res/drawable/rounded_button_color4.xml
new file mode 100644
index 0000000000..679bf24513
--- /dev/null
+++ b/android/app/src/main/res/drawable/rounded_button_color4.xml
@@ -0,0 +1,24 @@
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/rounded_edit.xml b/android/app/src/main/res/drawable/rounded_edit.xml
deleted file mode 100644
index 3c1cac4d1d..0000000000
--- a/android/app/src/main/res/drawable/rounded_edit.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/rounded_secondary_button.xml b/android/app/src/main/res/drawable/rounded_secondary_button.xml
new file mode 100644
index 0000000000..6230885b30
--- /dev/null
+++ b/android/app/src/main/res/drawable/rounded_secondary_button.xml
@@ -0,0 +1,24 @@
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/selector_show_password.xml b/android/app/src/main/res/drawable/selector_show_password.xml
new file mode 100644
index 0000000000..a44092aceb
--- /dev/null
+++ b/android/app/src/main/res/drawable/selector_show_password.xml
@@ -0,0 +1,5 @@
+
+
+