Skip to content

Commit 7203985

Browse files
roundhillroundhill
committed
Merge pull request #262 from wordpress-mobile/issue-250
fix #250: show a VideoPress alert for WP.com blogs
2 parents 1786579 + 45cf143 commit 7203985

File tree

7 files changed

+221
-167
lines changed

7 files changed

+221
-167
lines changed

‎res/values/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
<string name="please_wait_refresh_done">Please wait, loading items.</string>
108108
<string name="please_wait_uploading_done">Please wait, uploading item.</string>
109109
<string name="info">Info</string>
110+
<string name="learn_more">Learn More</string>
110111

111112
<!-- Media Gallery Action Bar -->
112113
<string name="media_add_popup_title">Add to media library</string>

‎src/org/wordpress/android/Constants.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ public class Constants {
1313

1414
public static String wpcomXMLRPCURL = "https://wordpress.com/xmlrpc.php";
1515
public static String wpcomLoginURL = "https://wordpress.com/wp-login.php";
16-
16+
17+
public static String videoPressURL = "http://videopress.com";
18+
1719
public static int QUICK_POST_PHOTO_CAMERA = 0;
1820
public static int QUICK_POST_PHOTO_LIBRARY = 1;
1921
public static int QUICK_POST_VIDEO_CAMERA = 2;

‎src/org/wordpress/android/ui/media/MediaBrowserActivity.java‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package org.wordpress.android.ui.media;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
63
import android.app.AlertDialog;
74
import android.app.AlertDialog.Builder;
85
import android.content.DialogInterface;
@@ -36,9 +33,7 @@
3633
import com.actionbarsherlock.widget.SearchView;
3734
import com.actionbarsherlock.widget.SearchView.OnQueryTextListener;
3835

39-
import org.xmlrpc.android.ApiHelper;
40-
import org.xmlrpc.android.ApiHelper.GetFeatures.Callback;
41-
36+
import org.wordpress.android.Constants;
4237
import org.wordpress.android.R;
4338
import org.wordpress.android.WordPress;
4439
import org.wordpress.android.models.FeatureSet;
@@ -52,6 +47,11 @@
5247
import org.wordpress.android.util.MediaDeleteService;
5348
import org.wordpress.android.util.Utils;
5449
import org.wordpress.android.util.WPAlertDialogFragment;
50+
import org.xmlrpc.android.ApiHelper;
51+
import org.xmlrpc.android.ApiHelper.GetFeatures.Callback;
52+
53+
import java.util.ArrayList;
54+
import java.util.List;
5555

5656
/**
5757
* The main activity in which the user can browse their media.
@@ -236,15 +236,19 @@ private void showVideoPressUpgradeDialog() {
236236
FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
237237
String title = getString(R.string.media_no_video_title);
238238
String message = getString(R.string.media_no_video_message);
239-
WPAlertDialogFragment.newInstance(message, title, false).show(ft, "alert");
240-
};
239+
String infoTitle = getString(R.string.learn_more);
240+
String infoURL = Constants.videoPressURL;
241+
242+
WPAlertDialogFragment.newInstance(message, title, false, infoTitle, infoURL)
243+
.show(ft, "alert");
244+
}
241245

242246
@Override
243247
protected void onResume() {
244248
super.onResume();
245249
startMediaDeleteService();
246250
getFeatureSet();
247-
};
251+
}
248252

249253
/** Get the feature set for a wordpress.com hosted blog **/
250254
private void getFeatureSet() {

‎src/org/wordpress/android/ui/posts/PostsActivity.java‎

Lines changed: 46 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
package org.wordpress.android.ui.posts;
22

3-
import java.io.BufferedReader;
4-
import java.io.InputStreamReader;
5-
import java.net.HttpURLConnection;
6-
import java.net.URL;
7-
import java.util.Iterator;
8-
import java.util.HashMap;
9-
import java.util.Map;
10-
113
import android.app.AlertDialog;
124
import android.app.Dialog;
135
import android.app.ProgressDialog;
146
import android.content.DialogInterface;
157
import android.content.Intent;
168
import android.content.SharedPreferences;
9+
import android.net.Uri;
1710
import android.os.AsyncTask;
1811
import android.os.Bundle;
1912
import android.preference.PreferenceManager;
@@ -26,23 +19,30 @@
2619
import com.actionbarsherlock.view.MenuInflater;
2720
import com.actionbarsherlock.view.MenuItem;
2821

29-
import org.xmlrpc.android.ApiHelper;
30-
import org.xmlrpc.android.XMLRPCClient;
31-
import org.xmlrpc.android.XMLRPCException;
32-
3322
import org.wordpress.android.R;
3423
import org.wordpress.android.WordPress;
35-
import org.wordpress.passcodelock.AppLockManager;
3624
import org.wordpress.android.models.Post;
3725
import org.wordpress.android.ui.MenuDrawerItem;
3826
import org.wordpress.android.ui.WPActionBarActivity;
3927
import org.wordpress.android.ui.comments.AddCommentActivity;
40-
import org.wordpress.android.ui.posts.ViewPostFragment.OnDetailPostActionListener;
28+
import org.wordpress.android.ui.notifications.NotificationsActivity;
4129
import org.wordpress.android.ui.posts.PostsListFragment.OnPostActionListener;
4230
import org.wordpress.android.ui.posts.PostsListFragment.OnPostSelectedListener;
4331
import org.wordpress.android.ui.posts.PostsListFragment.OnRefreshListener;
32+
import org.wordpress.android.ui.posts.ViewPostFragment.OnDetailPostActionListener;
4433
import org.wordpress.android.util.WPAlertDialogFragment.OnDialogConfirmListener;
45-
import org.wordpress.android.ui.notifications.NotificationsActivity;
34+
import org.wordpress.passcodelock.AppLockManager;
35+
import org.xmlrpc.android.ApiHelper;
36+
import org.xmlrpc.android.XMLRPCClient;
37+
import org.xmlrpc.android.XMLRPCException;
38+
39+
import java.io.BufferedReader;
40+
import java.io.InputStreamReader;
41+
import java.net.HttpURLConnection;
42+
import java.net.URL;
43+
import java.util.HashMap;
44+
import java.util.Iterator;
45+
import java.util.Map;
4646

4747
public class PostsActivity extends WPActionBarActivity implements OnPostSelectedListener,
4848
OnRefreshListener, OnPostActionListener, OnDetailPostActionListener, OnDialogConfirmListener {
@@ -75,7 +75,7 @@ public void onCreate(Bundle savedInstanceState) {
7575
startNotificationsActivity(extras);
7676
return;
7777
}
78-
78+
7979
// Restore last selection on app creation
8080
if (WordPress.shouldRestoreSelectedActivity && WordPress.getCurrentBlog() != null
8181
&& !(this instanceof PagesActivity)) {
@@ -123,9 +123,7 @@ public void onFailure() {
123123

124124
if (extras != null) {
125125
isPage = extras.getBoolean("viewPages");
126-
String errorMessage = extras.getString("errorMessage");
127-
if (errorMessage != null)
128-
showPostUploadErrorAlert(errorMessage);
126+
showErrorDialogIfNeeded(extras);
129127
}
130128

131129
if (isPage)
@@ -151,20 +149,25 @@ public void OnPostUploaded() {
151149
popPostDetail();
152150
}
153151

154-
private void showPostUploadErrorAlert(String errorMessage) {
155-
156-
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(
157-
PostsActivity.this);
158-
dialogBuilder.setTitle(getResources().getText(
159-
R.string.error));
152+
private void showPostUploadErrorAlert(String errorMessage, String infoTitle,
153+
final String infoURL) {
154+
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(PostsActivity.this);
155+
dialogBuilder.setTitle(getResources().getText(R.string.error));
160156
dialogBuilder.setMessage(errorMessage);
161157
dialogBuilder.setPositiveButton("OK",
162158
new DialogInterface.OnClickListener() {
163-
public void onClick(DialogInterface dialog,
164-
int whichButton) {
159+
public void onClick(DialogInterface dialog, int whichButton) {
165160
// Just close the window.
166161
}
167162
});
163+
if (infoTitle != null && infoURL != null) {
164+
dialogBuilder.setNeutralButton(infoTitle,
165+
new DialogInterface.OnClickListener() {
166+
public void onClick(DialogInterface dialog, int whichButton) {
167+
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(infoURL)));
168+
}
169+
});
170+
}
168171
dialogBuilder.setCancelable(true);
169172
if (!isFinishing())
170173
dialogBuilder.create().show();
@@ -181,12 +184,19 @@ protected void onNewIntent(Intent intent) {
181184
startNotificationsActivity(extras);
182185
return;
183186
}
184-
185-
String errorMessage = extras.getString("errorMessage");
186-
if (errorMessage != null)
187-
showPostUploadErrorAlert(errorMessage);
188187
}
189-
188+
}
189+
190+
private void showErrorDialogIfNeeded(Bundle extras) {
191+
if (extras == null) {
192+
return ;
193+
}
194+
String errorMessage = extras.getString("errorMessage");
195+
String errorInfoTitle = extras.getString("errorInfoTitle");
196+
String errorInfoLink = extras.getString("errorInfoLink");
197+
if (errorMessage != null) {
198+
showPostUploadErrorAlert(errorMessage, errorInfoTitle, errorInfoLink);
199+
}
190200
}
191201

192202
private void startNotificationsActivity(Bundle extras) {
@@ -345,7 +355,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
345355
if (!returnText.equals("CANCEL")) {
346356
// Add comment to the server if user didn't cancel.
347357
final String postID = extras.getString("postID");
348-
new PostsActivity.addCommentTask().execute(postID, returnText);
358+
new addCommentTask().execute(postID, returnText);
349359
}
350360
}
351361
}
@@ -709,7 +719,7 @@ protected String doInBackground(Post... params) {
709719
}
710720

711721
private void refreshComments() {
712-
new PostsActivity.refreshCommentsTask().execute();
722+
new refreshCommentsTask().execute();
713723
}
714724

715725
private String getShortlinkTagHref(String urlString) {
@@ -813,7 +823,7 @@ public void onClick(DialogInterface dialog,
813823
new DialogInterface.OnClickListener() {
814824
public void onClick(DialogInterface dialog,
815825
int whichButton) {
816-
new PostsActivity.deletePostTask().execute(post);
826+
new deletePostTask().execute(post);
817827
}
818828
});
819829
dialogBuilder.setNegativeButton(
@@ -832,7 +842,7 @@ public void onClick(DialogInterface dialog,
832842

833843
}
834844
} else if (action == POST_SHARE) {
835-
new PostsActivity.shareURLTask().execute(post);
845+
new shareURLTask().execute(post);
836846
} else if (action == POST_CLEAR) {
837847
FragmentManager fm = getSupportFragmentManager();
838848
ViewPostFragment f = (ViewPostFragment) fm

0 commit comments

Comments
 (0)