1 files changed, 13 insertions, 11 deletions
diff --git a/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java b/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java
index 84c343a..da20039 100644
--- a/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java
+++ b/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java
@@ -13,7 +13,7 @@ import ch.boye.httpclientandroidlib.HttpResponse;
 import org.apache.commons.lang3.StringUtils;
 
 import rx.Observable;
-import rx.android.observables.AndroidObservable;
+import rx.android.app.AppObservable;
 import rx.functions.Action1;
 import rx.functions.Func0;
 
@@ -24,11 +24,11 @@ import android.util.AttributeSet;
 
 public class RegisterSend2CgeoPreference extends AbstractClickablePreference {
 
-    public RegisterSend2CgeoPreference(Context context, AttributeSet attrs) {
+    public RegisterSend2CgeoPreference(final Context context, final AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public RegisterSend2CgeoPreference(Context context, AttributeSet attrs, int defStyle) {
+    public RegisterSend2CgeoPreference(final Context context, final AttributeSet attrs, final int defStyle) {
         super(context, attrs, defStyle);
     }
 
@@ -36,7 +36,7 @@ public class RegisterSend2CgeoPreference extends AbstractClickablePreference {
     protected OnPreferenceClickListener getOnPreferenceClickListener(final SettingsActivity activity) {
         return new OnPreferenceClickListener() {
             @Override
-            public boolean onPreferenceClick(Preference preference) {
+            public boolean onPreferenceClick(final Preference preference) {
                 // satisfy static code analysis
                 if (activity == null) {
                     return true;
@@ -55,23 +55,25 @@ public class RegisterSend2CgeoPreference extends AbstractClickablePreference {
                         activity.getString(R.string.init_sendToCgeo_registering), true);
                 progressDialog.setCancelable(false);
 
-                AndroidObservable.bindActivity(activity, Observable.defer(new Func0<Observable<Integer>>() {
+                AppObservable.bindActivity(activity, Observable.defer(new Func0<Observable<Integer>>() {
                     @Override
                     public Observable<Integer> call() {
                         final String nam = StringUtils.defaultString(deviceName);
                         final String cod = StringUtils.defaultString(deviceCode);
 
                         final Parameters params = new Parameters("name", nam, "code", cod);
-                        HttpResponse response = Network.getRequest("http://send2.cgeo.org/auth.html", params);
+                        final HttpResponse response = Network.getRequest("http://send2.cgeo.org/auth.html", params);
 
                         if (response != null && response.getStatusLine().getStatusCode() == 200) {
                             //response was OK
                             final String[] strings = StringUtils.split(Network.getResponseData(response), ',');
-                            Settings.setWebNameCode(nam, strings[0]);
-                            try {
-                                return Observable.from(Integer.parseInt(strings[1].trim()));
-                            } catch (final Exception e) {
-                                Log.e("RegisterSend2CgeoPreference", e);
+                            if (strings != null) {
+                                Settings.setWebNameCode(nam, strings[0]);
+                                try {
+                                    return Observable.just(Integer.parseInt(strings[1].trim()));
+                                } catch (final Exception e) {
+                                    Log.e("RegisterSend2CgeoPreference", e);
+                                }
                             }
                         }