Merge pull request #990 from wordpress-mobile/issue/864-remove-blackb…

…erry-related-code Remove unused BlackBerry resources and code
wordpress-mobile · Feb 28, 2014 · 57400d3 · 57400d3
2 parents dd869ed + a7bf738
commit 57400d3
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 545 deletions.
diff --git a/assets/licenses_bb.html b/assets/licenses_bb.html
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -261,7 +261,6 @@
     <string name="post_signature">Post signature</string>
     <string name="add_tagline">Add a signature to new posts</string>
     <string name="posted_from">Posted from WordPress for Android</string>
-    <string name="posted_from_blackberry">Posted from WordPress for BlackBerry</string>
     <string name="preview">Preview</string>
 
     <!-- new account view -->
@@ -511,7 +510,6 @@
 
     <!-- About View -->
     <string name="app_title">WordPress for Android</string>
-    <string name="app_title_blackberry">WordPress for BlackBerry</string>
     <string name="publisher">Publisher: Automattic, Inc</string>
     <string name="copyright">©2014 Automattic, Inc</string>
     <string name="version">Version</string>

diff --git a/src/org/wordpress/android/WordPress.java b/src/org/wordpress/android/WordPress.java
@@ -482,11 +482,7 @@ public HttpResponse performRequest(Request<?> request, Map<String, String> heade
                     }
 
                     HashMap<String, String> defaultHeaders = new HashMap<String, String>();
-                    if (DeviceUtils.getInstance().isBlackBerry()) {
-                        defaultHeaders.put("User-Agent", DeviceUtils.getBlackBerryUserAgent());
-                    } else {
-                        defaultHeaders.put("User-Agent", "wp-android/" + WordPress.versionName);
-                    }
+                    defaultHeaders.put("User-Agent", "wp-android/" + WordPress.versionName);
                     headers.putAll(defaultHeaders);
 
                     return super.performRequest(request, headers);
@@ -509,11 +505,7 @@ public HttpResponse performRequest(Request<?> request, Map<String, String> heade
                     }
 
                     HashMap<String, String> defaultHeaders = new HashMap<String, String>();
-                    if (DeviceUtils.getInstance().isBlackBerry()) {
-                        defaultHeaders.put("User-Agent", DeviceUtils.getBlackBerryUserAgent());
-                    } else {
-                        defaultHeaders.put("User-Agent", "wp-android/" + WordPress.versionName);
-                    }
+                    defaultHeaders.put("User-Agent", "wp-android/" + WordPress.versionName);
                     headers.putAll(defaultHeaders);
 
                     return super.performRequest(request, headers);

diff --git a/src/org/wordpress/android/networking/RestClientUtils.java b/src/org/wordpress/android/networking/RestClientUtils.java
@@ -3,6 +3,14 @@
  */
 package org.wordpress.android.networking;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
 import android.os.AsyncTask;
 
 import com.android.volley.DefaultRetryPolicy;
@@ -17,18 +25,10 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+
 import org.wordpress.android.WordPress;
 import org.wordpress.android.models.Note;
 import org.wordpress.android.ui.stats.StatsBarChartUnit;
-import org.wordpress.android.util.DeviceUtils;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
 
 public class RestClientUtils {
     private static final String NOTIFICATION_FIELDS = "id,type,unread,body,subject,timestamp,meta";
@@ -61,11 +61,7 @@ public RestClientUtils(RequestQueue queue, Authenticator authenticator) {
         // load an existing access token from prefs if we have one
         mAuthenticator = authenticator;
         mRestClient = RestClientFactory.instantiate(queue);
-        if (DeviceUtils.getInstance().isBlackBerry()) {
-            mRestClient.setUserAgent(DeviceUtils.getBlackBerryUserAgent());
-        } else {
-            mRestClient.setUserAgent("wp-android/" + WordPress.versionName);
-        }
+        mRestClient.setUserAgent("wp-android/" + WordPress.versionName);
     }
 
     /**

diff --git a/src/org/wordpress/android/ui/prefs/AboutActivity.java b/src/org/wordpress/android/ui/prefs/AboutActivity.java
@@ -14,7 +14,6 @@
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
-import org.wordpress.android.util.DeviceUtils;
 
 public class AboutActivity extends Activity implements OnClickListener {
 
@@ -31,11 +30,6 @@ public void onCreate(Bundle icicle) {
             getActionBar().setDisplayHomeAsUpEnabled(true);
         }
 
-        if (DeviceUtils.getInstance().isBlackBerry()) {
-            TextView appTitle = (TextView) findViewById(R.id.about_first_line);
-            appTitle.setText(getString(R.string.app_title_blackberry));
-        }
-
         TextView version = (TextView) findViewById(R.id.about_version);
         version.setText(getString(R.string.version) + " "
                 + WordPress.versionName);

diff --git a/src/org/wordpress/android/ui/prefs/LicensesActivity.java b/src/org/wordpress/android/ui/prefs/LicensesActivity.java
@@ -4,7 +4,6 @@
 
 import org.wordpress.android.R;
 import org.wordpress.android.ui.WebViewActivity;
-import org.wordpress.android.util.DeviceUtils;
 
 /**
  * Display open source licenses for the application.
@@ -15,11 +14,7 @@ public class LicensesActivity extends WebViewActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTitle(getResources().getText(R.string.open_source_licenses));
-        if (DeviceUtils.getInstance().isBlackBerry()) {
-            loadUrl("file:///android_asset/licenses_bb.html");
-        } else {
-            loadUrl("file:///android_asset/licenses.html");
-        }
+        loadUrl("file:///android_asset/licenses.html");
     }
 
 }
diff --git a/src/org/wordpress/android/ui/prefs/PreferencesActivity.java b/src/org/wordpress/android/ui/prefs/PreferencesActivity.java
@@ -1,5 +1,14 @@
 package org.wordpress.android.ui.prefs;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -37,6 +46,8 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.wordpress.passcodelock.AppLockManager;
+
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.ui.ShareIntentReceiverActivity;
@@ -46,21 +57,10 @@
 import org.wordpress.android.ui.notifications.NotificationUtils;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
-import org.wordpress.android.util.DeviceUtils;
 import org.wordpress.android.util.MapUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.WPEditTextPreference;
-import org.wordpress.passcodelock.AppLockManager;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @SuppressWarnings("deprecation")
 public class PreferencesActivity extends SherlockPreferenceActivity {
@@ -315,24 +315,12 @@ public void displayPreferences() {
             hideNotificationBlogsCategory();
         } else {
             if (mTaglineTextPreference.getText() == null || mTaglineTextPreference.getText().equals("")) {
-                if (DeviceUtils.getInstance().isBlackBerry()) {
-                    mTaglineTextPreference.setSummary(R.string.posted_from_blackberry);
-                    mTaglineTextPreference.setText(getString(R.string.posted_from_blackberry));
-                } else {
-                    mTaglineTextPreference.setSummary(R.string.posted_from);
-                    mTaglineTextPreference.setText(getString(R.string.posted_from));
-                }
+                mTaglineTextPreference.setSummary(R.string.posted_from);
+                mTaglineTextPreference.setText(getString(R.string.posted_from));
             } else {
                 mTaglineTextPreference.setSummary(mTaglineTextPreference.getText());
             }
         }
-
-        if (DeviceUtils.getInstance().isBlackBerry()) {
-            PreferenceCategory appAboutSectionName = (PreferenceCategory) findPreference("wp_pref_app_about_section");
-            appAboutSectionName.setTitle(getString(R.string.app_title_blackberry));
-            Preference appName = (Preference) findPreference("wp_pref_app_title");
-            appName.setTitle(getString(R.string.app_title_blackberry));
-        }
     }
 
     /**

diff --git a/src/org/wordpress/android/util/DeviceUtils.java b/src/org/wordpress/android/util/DeviceUtils.java
@@ -1,63 +1,20 @@
 package org.wordpress.android.util;
 
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Build;
-
-import org.wordpress.android.WordPress;
-import org.wordpress.android.util.AppLog.T;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-/**
- * As of January 20 2012:
- * The BlackBerry Runtime for Android Apps supports Android 2.3.3 applications.
- *
- * Unsupported App Types:
- * - Widget apps : Apps that are only meant to be widgets are not supported
- * - Apps that include no launchable Activity
- * - Apps that include more than one launchable Activity
- * - Apps whose minimum required Android API level is more than 10, and whose maximum supported level is less than 10
- *
- *  Unsupported Hardware Features:
- *  - Telephony (including SMS and MMS)
- *  - Bluetooth
- *  - Camera:  The intent to launch the camera is supported. However, currently the Camera class in the Android SDK is not supported.
- *  As a result, although you can launch the camera application, you cannot access the Camera hardware.
- * - NFC
- * - Barometers
- * - Ambient light sensor
- * - Proximity sensor
- * - VoIP
- *
- * Unsupported Software Features:
- * - Vending (In App Payments): com.android.vending
- * - Cloud To Device Messaging (Push): com.google.android.c2dm
- * - Google Maps: com.google.android.maps
- * - Text to Speech: com.google.tts
- *
- *
- * Major Details here: https://bdsc.webapps.blackberry.com/android/apisupport
- *
- *
- * @author daniloercoli
- *
- */
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Build;
 
+import org.wordpress.android.util.AppLog.T;
 
 public class DeviceUtils {
 
     private static DeviceUtils instance;
-
-    private boolean isBlackBerry = false;
     private boolean isKindleFire = false;
 
-    public boolean isBlackBerry() {
-        return isBlackBerry;
-    }
-
     public boolean isKindleFire() {
         return isKindleFire;
     }
@@ -70,15 +27,8 @@ public static DeviceUtils getInstance() {
     }
 
     private DeviceUtils() {
-        /*isPlayBook =  android.os.Build.MANUFACTURER.equalsIgnoreCase( "Research in Motion" ) &&
-                android.os.Build.MODEL.startsWith( "BlackBerry Runtime for Android" ); */
-        isBlackBerry = System.getProperty("os.name").equalsIgnoreCase("qnx") ? true : false;
         isKindleFire = android.os.Build.MODEL.equalsIgnoreCase("kindle fire") ? true: false;
     };
-
-    public static String getBlackBerryUserAgent() {
-        return "wp-blackberry/"+WordPress.versionName;
-    }
 
     /**
      * Checks camera availability recursively based on API level.

diff --git a/src/org/xmlrpc/android/XMLRPCClient.java b/src/org/xmlrpc/android/XMLRPCClient.java
@@ -1,5 +1,24 @@
 package org.xmlrpc.android;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.SequenceInputStream;
+import java.io.StringWriter;
+import java.net.URI;
+import java.net.URL;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import android.text.TextUtils;
 import android.util.Xml;
 
@@ -18,32 +37,13 @@
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.util.EntityUtils;
-import org.wordpress.android.WordPress;
-import org.wordpress.android.datasets.TrustedSslDomainTable;
-import org.wordpress.android.util.DeviceUtils;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlSerializer;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.SequenceInputStream;
-import java.io.StringWriter;
-import java.net.URI;
-import java.net.URL;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.wordpress.android.WordPress;
+import org.wordpress.android.datasets.TrustedSslDomainTable;
 
 /**
  * A WordPress XMLRPC Client.
@@ -76,11 +76,7 @@ public XMLRPCClient(URI uri, String httpuser, String httppasswd) {
         mPostMethod = new HttpPost(uri);
         mPostMethod.addHeader("Content-Type", "text/xml");
         mPostMethod.addHeader("charset", "UTF-8");
-        if (DeviceUtils.getInstance().isBlackBerry()) {
-            mPostMethod.addHeader("User-Agent", DeviceUtils.getBlackBerryUserAgent());
-        } else {
-            mPostMethod.addHeader("User-Agent", "wp-android/" + WordPress.versionName);
-        }
+        mPostMethod.addHeader("User-Agent", "wp-android/" + WordPress.versionName);
 
         mHttpParams = mPostMethod.getParams();
         HttpProtocolParams.setUseExpectContinue(mHttpParams, false);