diff --git a/android/app/src/main/cpp/native.cpp b/android/app/src/main/cpp/native.cpp index 3179534b34..2a82f3e3a2 100644 --- a/android/app/src/main/cpp/native.cpp +++ b/android/app/src/main/cpp/native.cpp @@ -172,7 +172,7 @@ JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnDest JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeGotoUrl(JNIEnv* env, jobject obj, jstring url) { QAndroidJniObject jniUrl("java/lang/String", "(Ljava/lang/String;)V", url); - DependencyManager::get()->handleLookupString(jniUrl.toString()); + DependencyManager::get()->loadSettings(jniUrl.toString()); } JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnPause(JNIEnv* env, jobject obj) { 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 461b71eb7c..907433d938 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,13 +12,6 @@ import android.widget.TextView; import com.squareup.picasso.Picasso; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; import java.util.List; import io.highfidelity.hifiinterface.R; @@ -31,6 +24,7 @@ import io.highfidelity.hifiinterface.provider.UserStoryDomainProvider; public class DomainAdapter extends RecyclerView.Adapter { private static final String TAG = "HiFi Interface"; + private static final String DEFAULT_THUMBNAIL_PLACE = "android.resource://io.highfidelity.hifiinterface/" + R.drawable.thumbnail_default_place; private Context mContext; private LayoutInflater mInflater; private ItemClickListener mClickListener; @@ -57,6 +51,9 @@ public class DomainAdapter extends RecyclerView.Adapter domain) { + if (filterText.length() == 0) { + domain.add(0, new Domain(mContext.getString(R.string.your_last_location), "", DEFAULT_THUMBNAIL_PLACE)); + } mDomains = new Domain[domain.size()]; mDomains = domain.toArray(mDomains); notifyDataSetChanged(); diff --git a/android/app/src/main/res/drawable/thumbnail_default_place.png b/android/app/src/main/res/drawable/thumbnail_default_place.png new file mode 100644 index 0000000000..1bd7d02ffb Binary files /dev/null and b/android/app/src/main/res/drawable/thumbnail_default_place.png differ diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 9646fe0a7e..4f5f29e671 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -20,5 +20,6 @@ Loading places… No places exist with that name Privacy Policy + Your Last Location diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 9e21e970cf..c8ba306db4 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3310,19 +3310,18 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { // If this is a first run we short-circuit the address passed in if (firstRun.get()) { -#if defined(Q_OS_ANDROID) - qCDebug(interfaceapp) << "First run... going to" << qPrintable(addressLookupString.isEmpty() ? QString("default location") : addressLookupString); - DependencyManager::get()->loadSettings(addressLookupString); -#else +#if !defined(Q_OS_ANDROID) DependencyManager::get()->goToEntry(); sentTo = SENT_TO_ENTRY; #endif firstRun.set(false); } else { +#if !defined(Q_OS_ANDROID) qCDebug(interfaceapp) << "Not first run... going to" << qPrintable(addressLookupString.isEmpty() ? QString("previous location") : addressLookupString); DependencyManager::get()->loadSettings(addressLookupString); sentTo = SENT_TO_PREVIOUS_LOCATION; +#endif } UserActivityLogger::getInstance().logAction("startup_sent_to", {