@@ -71,35 +71,58 @@ protected void onCreate(Bundle savedInstanceState) {
71
71
super .onCreate (savedInstanceState );
72
72
73
73
mPrefs = getSharedPreferences (PREFS , MODE_PRIVATE );
74
- // mPrefsEditor = mPrefs.edit();
75
74
76
75
setContentView (R .layout .play_media );
77
-
78
76
Intent intent = getIntent ();
77
+ this .queryText = intent .getStringExtra ("queryText" );
78
+ startup ();
79
+ }
80
+
81
+ @ Override
82
+ public void onNewIntent (Intent intent ) {
83
+ Log .v (TAG , "ON NEW INTENT IN PLAYMEDIACTIVITY" );
79
84
String origin = intent .getStringExtra ("ORIGIN" );
85
+ String from = intent .getStringExtra ("FROM" );
80
86
Log .v (TAG , "origin: " + origin );
81
- if ( origin == null ) {
82
- } else if (origin . equals ( "GoogleSearchReceiver" ) ) {
83
- this . queryText = intent . getStringExtra ( "queryText" );
84
- if ( searchDialog == null ) {
85
- searchDialog = new Dialog ( this );
87
+ Log . v ( TAG , "from: " + from );
88
+ if (from == null ) {
89
+ if ( origin . equals ( "GoogleSearchReceiver" )) {
90
+ this . queryText = intent . getStringExtra ( "queryText" );
91
+ startup ( );
86
92
}
87
- searchDialog .setCancelable (false );
88
- searchDialog .setContentView (R .layout .search_popup );
89
- searchDialog .setTitle ("Searching" );
90
-
91
- searchDialog .show ();
92
-
93
+ } else if (from .equals ("GDMReceiver" )) {
94
+ videoPlayed = false ;
95
+ Log .v (TAG , "Origin: " + intent .getStringExtra ("ORIGIN" ));
96
+ this .plexmediaServers = GoogleSearchPlexControlApplication .getPlexMediaServers ();
97
+ setClient ();
98
+ }
99
+ }
100
+
101
+ private void startup () {
102
+ if (searchDialog == null ) {
103
+ searchDialog = new Dialog (this );
104
+ }
105
+ searchDialog .setCancelable (false );
106
+ searchDialog .setContentView (R .layout .search_popup );
107
+ searchDialog .setTitle ("Searching" );
108
+
109
+ searchDialog .show ();
110
+
111
+ Gson gson = new Gson ();
112
+ PlexServer defaultServer = (PlexServer )gson .fromJson (mPrefs .getString ("Server" , "" ), PlexServer .class );
113
+ if (defaultServer != null ) {
114
+ this .plexmediaServers = new ConcurrentHashMap <String , PlexServer >();
115
+ this .plexmediaServers .put (defaultServer .getName (), defaultServer );
116
+ setClient ();
117
+ } else {
93
118
if (mServiceIntent == null ) {
94
119
mServiceIntent = new Intent (this , GDMService .class );
95
120
}
96
121
mServiceIntent .putExtra ("ORIGIN" , "PlayMediaActivity" );
97
122
startService (mServiceIntent );
98
-
99
-
100
123
}
101
124
}
102
-
125
+
103
126
@ Override
104
127
public boolean onOptionsItemSelected (MenuItem item ) {
105
128
switch (item .getItemId ()) {
@@ -131,60 +154,7 @@ private boolean showAbout() {
131
154
132
155
return true ;
133
156
}
134
- @ Override
135
- public void onNewIntent (Intent intent ) {
136
- Log .v (TAG , "ON NEW INTENT IN PLAYMEDIACTIVITY" );
137
- String origin = intent .getStringExtra ("ORIGIN" );
138
- String from = intent .getStringExtra ("FROM" );
139
- // this.queryText = intent.getStringExtra("queryText");
140
- Log .v (TAG , "origin: " + origin );
141
- Log .v (TAG , "from: " + from );
142
- if (from == null ) {
143
- if (origin .equals ("GoogleSearchReceiver" )) {
144
- Gson gson = new Gson ();
145
- PlexServer defaultServer = (PlexServer )gson .fromJson (mPrefs .getString ("Client" , "" ), PlexServer .class );
146
- if (defaultServer != null ) {
147
- this .plexmediaServers = new ConcurrentHashMap <String , PlexServer >();
148
- this .plexmediaServers .put (defaultServer .getName (), defaultServer );
149
-
150
- setClient ();
151
- } else {
152
- if (mServiceIntent == null ) {
153
- mServiceIntent = new Intent (this , GDMService .class );
154
- }
155
- mServiceIntent .putExtra ("ORIGIN" , "PlayMediaActivity" );
156
- startService (mServiceIntent );
157
- }
158
-
159
- }
160
- } else if (from .equals ("GDMReceiver" )) {
161
- videoPlayed = false ;
162
- // LocalBroadcastManager.getInstance(this).unregisterReceiver(gdmReceiver);
163
- Log .v (TAG , "Origin: " + intent .getStringExtra ("ORIGIN" ));
164
-
165
- this .plexmediaServers = GoogleSearchPlexControlApplication .getPlexMediaServers ();
166
-
167
- setClient ();
168
-
169
-
170
- }
171
-
172
-
173
- /*
174
- String from = intent.getStringExtra("FROM");
175
- Log.v(TAG, "From: " + from);
176
- if(from == null) {
177
-
178
- } else if(from.equals("GDMReceiver")) {
179
- Log.v(TAG, "Origin: " + intent.getStringExtra("ORIGIN"));
180
- String origin = intent.getStringExtra("ORIGIN") == null ? "" : intent.getStringExtra("ORIGIN");
181
- if(origin.equals("GoogleSearchReceiver")) {
182
- Log.v(TAG, "Got intent from google search receiver: " + intent.getStringExtra("queryText"));
183
- handleVoiceSearch(intent.getStringExtra("queryText"));
184
- }
185
- }
186
- */
187
- }
157
+
188
158
189
159
private void setClient () {
190
160
Pattern p = Pattern .compile ( "on (.*)$" , Pattern .DOTALL );
0 commit comments