History

recreated changes due to CLA issue in previous pr. Adding args to intent so that app can parse as comamnd line args.

amer cerkic committed 7 years ago

Commit 708da451 parent 9c8e21e4 files · +50 −9Browse files

Showing the changes to android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java (1 of 4 files). Show all

Unified · Split

android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java+14−2
@@ -24,6 +24,7 @@ import android.net.Uri; · 23 unmodified lines
2424 import android.os.Build;
2525 import android.os.Bundle;
2626 import android.os.Vibrator;
27+import android.text.TextUtils;
2728 import android.util.Log;
2829 import android.view.LayoutInflater;
2930 import android.view.View;
@@ -53,6 +54,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW · 23 unmodified lines
5354 public static final String DOMAIN_URL = "url";
5455 public static final String EXTRA_GOTO_USERNAME = "gotousername";
5556 private static final String TAG = "Interface";
57+ public static final String EXTRA_ARGS = "args";
5658 private static final int WEB_DRAWER_RIGHT_MARGIN = 262;
5759 private static final int WEB_DRAWER_BOTTOM_MARGIN = 150;
5860 private static final int NORMAL_DPI = 160;
@@ -77,6 +79,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW · 18 unmodified lines
7779
7880 private boolean nativeEnterBackgroundCallEnqueued = false;
7981 private SlidingDrawer mWebSlidingDrawer;
82+ private boolean mStartInDomain;
8083 // private GvrApi gvrApi;
8184 // Opaque native pointer to the Application C++ object.
8285 // This object is owned by the InterfaceActivity instance and passed to the native methods.
@@ -92,8 +95,14 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW · 9 unmodified lines
9295 public void onCreate(Bundle savedInstanceState) {
9396 super.isLoading = true;
9497 Intent intent = getIntent();
95− if (intent.hasExtra(DOMAIN_URL) && !intent.getStringExtra(DOMAIN_URL).isEmpty()) {
98+ if (intent.hasExtra(DOMAIN_URL) && !TextUtils.isEmpty(intent.getStringExtra(DOMAIN_URL))) {
9699 intent.putExtra("applicationArguments", "--url " + intent.getStringExtra(DOMAIN_URL));
100+ } else if (intent.hasExtra(EXTRA_ARGS)) {
101+ String args = intent.getStringExtra(EXTRA_ARGS);
102+ if (!TextUtils.isEmpty(args)) {
103+ mStartInDomain = true;
104+ intent.putExtra("applicationArguments", args);
105+ }
97106 }
98107 super.onCreate(savedInstanceState);
99108 getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
@@ -124,7 +133,10 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW · 24 unmodified lines
124133 getActionBar().hide();
125134 }
126135 });
127− startActivity(new Intent(this, SplashActivity.class));
136+ Intent splashIntent = new Intent(this, SplashActivity.class);
137+ splashIntent.putExtra(SplashActivity.EXTRA_START_IN_DOMAIN, mStartInDomain);
138+ startActivity(splashIntent);
139+
128140 mVibrator = (Vibrator) this.getSystemService(VIBRATOR_SERVICE);
129141 headsetStateReceiver = new HeadsetStateReceiver();
130142 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t