Skip to content

Commit 90e8744

Browse files
author
Chris Bellew
committed
Fixed bugs related to play media activity.
1 parent c315566 commit 90e8744

File tree

2 files changed

+42
-73
lines changed

2 files changed

+42
-73
lines changed

src/com/atomjack/vcfpht/MainActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@
4040
import com.loopj.android.http.AsyncHttpResponseHandler;
4141

4242
public class MainActivity extends Activity {
43-
public final static String PREFS = "GoogleSearchPlexControlPrefs";
44-
public final static String TAG = "GoogleSearchPlexControl";
45-
public final static String SEARCH_TYPE = "com.atomjack.googlesearchplexcontrol.SEARCH_TYPE";
43+
public final static String PREFS = "VoiceControlForPlexHomeTheaterPrefs";
44+
public final static String TAG = "VoiceControlForPlexHomeTheater";
4645

4746
public final static int FEEDBACK_VOICE = 0;
4847
public final static int FEEDBACK_TOAST = 1;

src/com/atomjack/vcfpht/PlayMediaActivity.java

Lines changed: 40 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -71,35 +71,58 @@ protected void onCreate(Bundle savedInstanceState) {
7171
super.onCreate(savedInstanceState);
7272

7373
mPrefs = getSharedPreferences(PREFS, MODE_PRIVATE);
74-
// mPrefsEditor = mPrefs.edit();
7574

7675
setContentView(R.layout.play_media);
77-
7876
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");
7984
String origin = intent.getStringExtra("ORIGIN");
85+
String from = intent.getStringExtra("FROM");
8086
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();
8692
}
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 {
93118
if(mServiceIntent == null) {
94119
mServiceIntent = new Intent(this, GDMService.class);
95120
}
96121
mServiceIntent.putExtra("ORIGIN", "PlayMediaActivity");
97122
startService(mServiceIntent);
98-
99-
100123
}
101124
}
102-
125+
103126
@Override
104127
public boolean onOptionsItemSelected(MenuItem item) {
105128
switch (item.getItemId()) {
@@ -131,60 +154,7 @@ private boolean showAbout() {
131154

132155
return true;
133156
}
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+
188158

189159
private void setClient() {
190160
Pattern p = Pattern.compile( "on (.*)$", Pattern.DOTALL);

0 commit comments

Comments
 (0)