From 039818d4df1b30e99e1c77ef072713980999d38e Mon Sep 17 00:00:00 2001
From: Aaron Huttner <Double@Aarons-MacBook-Pro.local>
Date: Thu, 25 Aug 2016 15:55:13 -0400
Subject: [PATCH] Update county names. Add image helper methods to change the
 aspect ratio of the signature and shrink the file size Add other party field.
 Change registration address --> residential address version bump

---
 .idea/misc.xml                                |   4 -
 app/build.gradle                              |   2 +-
 .../grommet/data/api/ApiModule.java           |   5 +-
 .../grommet/data/api/RegistrationService.java |  50 ++++---
 .../data/api/model/ApiVoterRegistration.java  |  24 +++-
 .../grommet/data/db/DbOpenHelper.java         |   3 +-
 .../grommet/data/db/model/RockyRequest.java   |  19 ++-
 .../grommet/ui/UploadNotification.java        |  20 ++-
 .../registration/AdditionalInfoFragment.java  |  37 ++++-
 .../ui/registration/RegistrationActivity.java |   2 +-
 .../ReviewAndConfirmFragment.java             |   5 +-
 .../grommet/ui/views/AddressView.java         |   2 +-
 .../grommet/ui/views/EventDetails.java        |   1 +
 .../com/rockthevote/grommet/util/Images.java  |  74 ++++++++++
 .../res/layout/fragment_additional_info.xml   |  24 ++++
 app/src/main/res/values/arrays.xml            | 136 +++++++++---------
 app/src/main/res/values/attrs.xml             |   1 +
 app/src/main/res/values/strings.xml           |   6 +-
 18 files changed, 304 insertions(+), 111 deletions(-)
 create mode 100644 app/src/main/java/com/rockthevote/grommet/util/Images.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index c3583903..1caa1363 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -2,10 +2,6 @@
 <project version="4">
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
-    <list size="2">
-      <item index="0" class="java.lang.String" itemvalue="com.rockthevote.grommet.data.prefs.CanvasserName" />
-      <item index="1" class="java.lang.String" itemvalue="com.rockthevote.grommet.data.prefs.EventName" />
-    </list>
   </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
diff --git a/app/build.gradle b/app/build.gradle
index 0c8fbb0d..42a3ac1e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 // Manifest version information!
 def versionMajor = 1
 def versionMinor = 0
-def versionPatch = 6
+def versionPatch = 7
 def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 apply plugin: 'com.android.application'
diff --git a/app/src/main/java/com/rockthevote/grommet/data/api/ApiModule.java b/app/src/main/java/com/rockthevote/grommet/data/api/ApiModule.java
index 8cf8d921..60d73fea 100644
--- a/app/src/main/java/com/rockthevote/grommet/data/api/ApiModule.java
+++ b/app/src/main/java/com/rockthevote/grommet/data/api/ApiModule.java
@@ -2,6 +2,8 @@
 
 import com.squareup.moshi.Moshi;
 
+import java.util.concurrent.TimeUnit;
+
 import javax.inject.Named;
 import javax.inject.Singleton;
 
@@ -51,6 +53,7 @@ public final class ApiModule {
 
     // add the O-Auth interceptor here
     static OkHttpClient.Builder createApiClient(OkHttpClient client) {
-        return client.newBuilder();
+        return client.newBuilder()
+                .connectTimeout(10000, TimeUnit.MILLISECONDS);
     }
 }
diff --git a/app/src/main/java/com/rockthevote/grommet/data/api/RegistrationService.java b/app/src/main/java/com/rockthevote/grommet/data/api/RegistrationService.java
index f910296d..12be9eaa 100644
--- a/app/src/main/java/com/rockthevote/grommet/data/api/RegistrationService.java
+++ b/app/src/main/java/com/rockthevote/grommet/data/api/RegistrationService.java
@@ -152,31 +152,45 @@ private void doWork(final RockyRequest rockyRequest) {
                         stopSelf();
                     }
                 })
-                .subscribe(regResponse -> {
-                    RockyRequest.Status status =
-                            !regResponse.isError() && regResponse.response().isSuccessful()
-                                    ? REGISTER_SUCCESS : REGISTER_SERVER_FAILURE;
-                    
-
-                    UploadNotification.notify(getApplicationContext(), status);
-
-                            db.update(RockyRequest.TABLE,
-                                    new RockyRequest.Builder()
-                                            .status(status)
-                                            .build(),
-                                    RockyRequest._ID + " = ? ", String.valueOf(rockyRequest.id()));
+                .subscribe(regResponse ->
+                        {
+                            if (regResponse.isError()) {
+                                // there was an error contacting the server, don't delete the row
+                                UploadNotification.notify(getApplicationContext(), REGISTER_SERVER_FAILURE);
+                            } else {
+
+                                RockyRequest.Status status;
+
+                                if (regResponse.response().isSuccessful()) {
+                                    status = REGISTER_SUCCESS;
+                                } else {
+                                    int code = regResponse.response().code();
+                                    if (code < 500) {
+                                        status = REGISTER_CLIENT_FAILURE;
+                                    } else {
+                                        status = REGISTER_SERVER_FAILURE;
+                                    }
+                                }
+                                updateRegistrationStatus(status, rockyRequest.id());
+                            }
                         },
                         throwable -> {
                             // mark the row for removal if the data is corrupt
-                            db.update(RockyRequest.TABLE,
-                                    new RockyRequest.Builder()
-                                            .status(REGISTER_CLIENT_FAILURE)
-                                            .build(),
-                                    RockyRequest._ID + " = ? ", String.valueOf(rockyRequest.id()));
+                            // this is a client error, meaning the network request was never made
+                            updateRegistrationStatus(REGISTER_CLIENT_FAILURE, rockyRequest.id());
                         }
                 );
     }
 
+    private void updateRegistrationStatus(RockyRequest.Status status, long rowId) {
+        UploadNotification.notify(getApplicationContext(), status);
+        db.update(RockyRequest.TABLE,
+                new RockyRequest.Builder()
+                        .status(status)
+                        .build(),
+                RockyRequest._ID + " = ? ", String.valueOf(rowId));
+    }
+
     /**
      * check for <p>
      * {@link RockyRequest.Status#ABANDONED},<p>
diff --git a/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiVoterRegistration.java b/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiVoterRegistration.java
index df8fa2c2..cad11d62 100644
--- a/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiVoterRegistration.java
+++ b/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiVoterRegistration.java
@@ -124,7 +124,19 @@ public static ApiVoterRegistration fromDb(RockyRequest rockyRequest,
                                               List<ApiAdditionalInfo> additionalInfo,
                                               ApiRegistrationHelper registrationHelper) {
 
-        return builder()
+        String party;
+        switch (rockyRequest.party()) {
+            case OTHER_PARTY:
+                party = rockyRequest.otherParty();
+                break;
+            default:
+                party = rockyRequest.party().toString();
+                break;
+        }
+
+        Builder builder = builder();
+
+        builder
                 .dateOfBirth(Dates.formatAsISO8601_ShortDate(rockyRequest.dateOfBirth()))
                 .mailingAddress(mailingAddress)
                 .previousRegistrationAddress(previousRegistrationAddress)
@@ -133,14 +145,18 @@ public static ApiVoterRegistration fromDb(RockyRequest rockyRequest,
                 .name(name)
                 .previousName(previousName)
                 .gender(Gender.fromPrefix(Prefix.fromString(name.titlePrefix())).toString())
-                .race(rockyRequest.race().toString())
-                .party(rockyRequest.party().toString())
+                .party(party)
                 .voterClassifications(voterClassifications)
                 .signature(signature)
                 .voterIds(voterIds)
                 .contactMethods(contactMethods)
                 .additionalInfo(additionalInfo)
                 .registrationHelper(registrationHelper)
-                .build();
+        ;
+
+        if (null != rockyRequest.race()) {
+            builder.race(rockyRequest.race().toString());
+        }
+        return builder.build();
     }
 }
diff --git a/app/src/main/java/com/rockthevote/grommet/data/db/DbOpenHelper.java b/app/src/main/java/com/rockthevote/grommet/data/db/DbOpenHelper.java
index 7048d588..ffb5b5af 100644
--- a/app/src/main/java/com/rockthevote/grommet/data/db/DbOpenHelper.java
+++ b/app/src/main/java/com/rockthevote/grommet/data/db/DbOpenHelper.java
@@ -45,7 +45,8 @@ public class DbOpenHelper extends SQLiteOpenHelper {
             + RockyRequest.LONGITUDE + " REAL,"
             + RockyRequest.HAS_PREVIOUS_NAME + " INTEGER DEFAULT " + Db.BOOLEAN_FALSE + ","
             + RockyRequest.HAS_PREVIOUS_ADDRESS + " INTEGER DEFAULT " + Db.BOOLEAN_FALSE + ","
-            + RockyRequest.HAS_ASSISTANT + " INTEGER DEFAULT " + Db.BOOLEAN_FALSE
+            + RockyRequest.HAS_ASSISTANT + " INTEGER DEFAULT " + Db.BOOLEAN_FALSE + ","
+            + RockyRequest.OTHER_PARTY + " TEXT "
             + ")";
 
     private static final String CREATE_ADDRESS = ""
diff --git a/app/src/main/java/com/rockthevote/grommet/data/db/model/RockyRequest.java b/app/src/main/java/com/rockthevote/grommet/data/db/model/RockyRequest.java
index 5c311c84..a4f0295a 100644
--- a/app/src/main/java/com/rockthevote/grommet/data/db/model/RockyRequest.java
+++ b/app/src/main/java/com/rockthevote/grommet/data/db/model/RockyRequest.java
@@ -43,6 +43,7 @@ public abstract class RockyRequest implements Parcelable, BaseColumns {
     public static final String HAS_PREVIOUS_NAME = "has_previous_name";
     public static final String HAS_PREVIOUS_ADDRESS = "has_previous_address";
     public static final String HAS_ASSISTANT = "has_assistant";
+    public static final String OTHER_PARTY = "other_party";
 
     public static final String SELECT_BY_ID = ""
             + "SELECT * FROM "
@@ -92,10 +93,8 @@ public abstract class RockyRequest implements Parcelable, BaseColumns {
 
     public abstract boolean hasMailingAddress();
 
-    @Nullable
     public abstract Race race();
 
-    @Nullable
     public abstract Party party();
 
     @Nullable
@@ -111,6 +110,9 @@ public abstract class RockyRequest implements Parcelable, BaseColumns {
 
     public abstract boolean hasAssistant();
 
+    @Nullable
+    public abstract String otherParty();
+
     public static final Func1<Cursor, RockyRequest> MAPPER = cursor -> {
         long id = Db.getLong(cursor, _ID);
         Status status = Status.fromString(Db.getString(cursor, STATUS));
@@ -136,12 +138,13 @@ public abstract class RockyRequest implements Parcelable, BaseColumns {
         boolean hasPreviousName = Db.getBoolean(cursor, HAS_PREVIOUS_NAME);
         boolean hasPreviousAddress = Db.getBoolean(cursor, HAS_PREVIOUS_ADDRESS);
         boolean hasAssistant = Db.getBoolean(cursor, HAS_ASSISTANT);
+        String otherParty = Db.getString(cursor, OTHER_PARTY);
 
         return new AutoValue_RockyRequest(id, status, language, phoneType, partnerId, optInEmail, optInSMS,
                 optInVolunteer, partnerOptInSMS, partnerOptInEmail,
                 sourceTrackingId, partnerTrackingId, openTrackingId,
                 generatedDate, dateOfBirth, hasMailingAddress, race, party, signature,
-                latitude, longitude, hasPreviousName, hasPreviousAddress, hasAssistant);
+                latitude, longitude, hasPreviousName, hasPreviousAddress, hasAssistant, otherParty);
     };
 
     public static final class Builder {
@@ -272,6 +275,11 @@ public Builder hasAssistant(boolean hasAssistant) {
             return this;
         }
 
+        public Builder otherParty(String otherParty) {
+            values.put(OTHER_PARTY, otherParty);
+            return this;
+        }
+
         public ContentValues build() {
             return values;
         }
@@ -311,7 +319,8 @@ public static Race fromString(String race) {
     public enum Party {
         DEMOCRATIC("Democratic"),
         REPUBLICAN("Republican"),
-        OTHER("Other");
+        NO_PARTY("none"),
+        OTHER_PARTY("Other");
 
         private final String party;
 
@@ -330,7 +339,7 @@ public static Party fromString(String party) {
                     return val;
                 }
             }
-            return OTHER;
+            return OTHER_PARTY;
         }
     }
 
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/UploadNotification.java b/app/src/main/java/com/rockthevote/grommet/ui/UploadNotification.java
index c4bb6156..3072513a 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/UploadNotification.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/UploadNotification.java
@@ -55,6 +55,7 @@ public static void notify(final Context context, RockyRequest.Status status) {
                                 new Intent(context, MainActivity.class),
                                 PendingIntent.FLAG_UPDATE_CURRENT))
                 .setContentTitle(context.getString(getNotifTitle(status)))
+                .setContentText(context.getString(getContentText(status)))
                 .setSmallIcon(R.drawable.ic_stat_upload)
                 .setAutoCancel(false);
 
@@ -71,12 +72,26 @@ int getNotifTitle(RockyRequest.Status status) {
         switch (status) {
             case REGISTER_SUCCESS:
                 return R.string.upload_notification_title_success;
-            default:
             case REGISTER_SERVER_FAILURE:
+            default:
                 return R.string.upload_notification_title_failure;
         }
     }
 
+    private static
+    @StringRes
+    int getContentText(RockyRequest.Status status) {
+        switch (status) {
+            case REGISTER_SUCCESS:
+                return R.string.upload_notification_content_success;
+            case REGISTER_CLIENT_FAILURE:
+                return R.string.upload_notification_content_client_failure;
+            case REGISTER_SERVER_FAILURE:
+            default:
+                return R.string.upload_notification_content_connection_failure;
+        }
+    }
+
     private static int getNotificationId(RockyRequest.Status status) {
         switch (status) {
             case REGISTER_SUCCESS:
@@ -98,8 +113,7 @@ private static String getNotificationTag(RockyRequest.Status status) {
     }
 
     /**
-     * Cancels any notifications of this type previously shown using
-     * {@link #notify(Context, boolean)}.
+     * Cancels any notifications of this type previously shown
      */
     public static void cancelSuccess(final Context context) {
         final NotificationManager nm = (NotificationManager) context
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/AdditionalInfoFragment.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/AdditionalInfoFragment.java
index ba33c642..1fe467f6 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/AdditionalInfoFragment.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/AdditionalInfoFragment.java
@@ -47,6 +47,7 @@
 import static com.rockthevote.grommet.data.db.model.ContactMethod.Type.EMAIL;
 import static com.rockthevote.grommet.data.db.model.ContactMethod.Type.PHONE;
 import static com.rockthevote.grommet.data.db.model.RockyRequest.Party;
+import static com.rockthevote.grommet.data.db.model.RockyRequest.Party.OTHER_PARTY;
 import static com.rockthevote.grommet.data.db.model.RockyRequest.Race;
 import static com.rockthevote.grommet.data.db.model.VoterId.Type.DRIVERS_LICENSE;
 import static com.rockthevote.grommet.data.db.model.VoterId.Type.SSN_LAST_FOUR;
@@ -55,8 +56,13 @@ public class AdditionalInfoFragment extends BaseRegistrationFragment {
 
     @BindView(R.id.spinner_race) BetterSpinner raceSpinner;
 
+    @NotEmpty
     @BindView(R.id.spinner_party) BetterSpinner partySpinner;
 
+    @NotEmpty
+    @BindView(R.id.til_other_party) TextInputLayout otherPartyTIL;
+    @BindView(R.id.other_party_edit_text) EditText otherPartyEditText;
+
     @BindView(R.id.preferred_language) EditText preferredLanguage;
 
     @BindView(R.id.does_not_have_penn_dot_checkbox) CheckBox noPennDOTCheckbox;
@@ -125,6 +131,8 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
 
         validator = new ObservableValidator(this, getActivity());
 
+
+        // Setup Race Spinner
         raceEnumAdapter = new EnumAdapter<>(getActivity(), Race.class);
         raceSpinner.setAdapter(raceEnumAdapter);
         raceSpinner.setOnItemClickListener((adapterView, view1, i, l) -> {
@@ -133,14 +141,27 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
         });
         raceSpinner.getEditText().setText(Race.OTHER.toString());
 
+
+        // Setup Party Spinner
         partyEnumAdapter = new EnumAdapter<>(getActivity(), Party.class);
         partySpinner.setAdapter(partyEnumAdapter);
         partySpinner.setOnItemClickListener((adapterView, view1, i, l) -> {
-            partySpinner.getEditText().setText(partyEnumAdapter.getItem(i).toString());
+            Party party = partyEnumAdapter.getItem(i);
+
+            partySpinner.getEditText().setText(party.toString());
             partySpinner.dismiss();
+
+            otherPartyTIL.setEnabled(OTHER_PARTY == party);
+            otherPartyTIL.setVisibility(OTHER_PARTY == party ? View.VISIBLE : View.GONE);
+
+            // clear the error out for a new attempt
+            if (OTHER_PARTY == party) {
+                otherPartyTIL.setErrorEnabled(false);
+            }
         });
-        partySpinner.getEditText().setText(Party.OTHER.toString());
 
+
+        // Setup Phone Type Spinner
         phoneTypeEnumAdapter = new EnumAdapter<>(getActivity(), RockyRequest.PhoneType.class);
         phoneTypeSpinner.setAdapter(phoneTypeEnumAdapter);
         phoneTypeSpinner.setOnItemClickListener((adapterView, view1, i, l) -> {
@@ -175,6 +196,18 @@ public void onResume() {
                             RockyRequest._ID + " = ? ", String.valueOf(rockyRequestRowId.get()));
                 }));
 
+        subscriptions.add(RxTextView.afterTextChangeEvents(otherPartyEditText)
+                .observeOn(Schedulers.io())
+                .skip(1)
+                .debounce(DEBOUNCE, TimeUnit.MILLISECONDS)
+                .subscribe(otherParty -> {
+                    db.update(RockyRequest.TABLE,
+                            new RockyRequest.Builder()
+                                    .otherParty(otherParty.editable().toString())
+                                    .build(),
+                            RockyRequest._ID + " = ? ", String.valueOf(rockyRequestRowId.get()));
+                }));
+
         subscriptions.add(RxTextView.afterTextChangeEvents(partySpinner.getEditText())
                 .observeOn(Schedulers.io())
                 .skip(1)
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationActivity.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationActivity.java
index c158410f..17cadaa6 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationActivity.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationActivity.java
@@ -70,7 +70,7 @@ private void setupViewPager() {
         adapter = new RegistrationPagerAdapter(getSupportFragmentManager(), this);
 
         viewPager.setAdapter(adapter);
-        viewPager.setOffscreenPageLimit(3);
+        viewPager.setOffscreenPageLimit(4);
 
         tabLayout.setupWithViewPager(viewPager);
 
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java
index c0bee761..363098ce 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java
@@ -23,6 +23,7 @@
 import com.rockthevote.grommet.data.prefs.CurrentRockyRequestId;
 import com.rockthevote.grommet.data.prefs.EventRegTotal;
 import com.rockthevote.grommet.util.Dates;
+import com.rockthevote.grommet.util.Images;
 import com.squareup.sqlbrite.BriteDatabase;
 
 import java.io.ByteArrayOutputStream;
@@ -197,7 +198,9 @@ public void onStartSigning() {
     @Override
     public void onSigned() {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        signaturePad.getSignatureBitmap().compress(Bitmap.CompressFormat.PNG, 100, baos);
+        Bitmap image = (Images.aspectSafeScale(Images.transformAspectRatio(signaturePad.getSignatureBitmap(), 3, 1), 180, 60));
+        image.compress(Bitmap.CompressFormat.PNG, 100, baos);
+
         db.update(RockyRequest.TABLE,
                 new RockyRequest.Builder()
                         .signature(baos.toByteArray())
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/views/AddressView.java b/app/src/main/java/com/rockthevote/grommet/ui/views/AddressView.java
index 44edf794..9a997068 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/views/AddressView.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/views/AddressView.java
@@ -56,7 +56,7 @@ public class AddressView extends FrameLayout {
 
     @BindView(R.id.spinner_state) BetterSpinner stateSpinner;
 
-    @Length(min = 5)
+    @Length(min = 5, max = 10)
     @BindView(R.id.til_zip_code) TextInputLayout zipTIL;
     @BindView(R.id.zip) EditText zipEditText;
 
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/views/EventDetails.java b/app/src/main/java/com/rockthevote/grommet/ui/views/EventDetails.java
index 08e53a59..4fdbf4b6 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/views/EventDetails.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/views/EventDetails.java
@@ -13,6 +13,7 @@
 import android.widget.TextView;
 
 import com.f2prateek.rx.preferences.Preference;
+import com.mobsandgeeks.saripaar.annotation.Length;
 import com.rockthevote.grommet.R;
 import com.rockthevote.grommet.data.Injector;
 import com.rockthevote.grommet.data.api.RockyService;
diff --git a/app/src/main/java/com/rockthevote/grommet/util/Images.java b/app/src/main/java/com/rockthevote/grommet/util/Images.java
new file mode 100644
index 00000000..7a6b6958
--- /dev/null
+++ b/app/src/main/java/com/rockthevote/grommet/util/Images.java
@@ -0,0 +1,74 @@
+package com.rockthevote.grommet.util;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+
+public class Images {
+
+    /**
+     * transforms the aspect ratio by adding whitespace around the image
+     *
+     * @param image
+     * @param x
+     * @param y
+     * @return
+     */
+    public static Bitmap transformAspectRatio(Bitmap image, int x, int y) {
+
+        if (x == y) {
+            return image;
+        }
+
+        int width = image.getWidth();
+        int height = image.getHeight();
+        float imageRatio = (float) width / height;
+        float aspectRatio = (float) x / y;
+
+        int newHeight;
+        int newWidth;
+
+        if (imageRatio > aspectRatio) {
+            // add whitespace to image height
+            newHeight = (width * y) / x;
+            newWidth = width;
+
+        } else {
+            // add whitespace to image width
+            newHeight = height;
+            newWidth = (x * height) / y;
+        }
+
+        Bitmap whiteBgBitmap = Bitmap.createBitmap(newWidth, newHeight, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(whiteBgBitmap);
+        canvas.drawColor(Color.WHITE);
+        canvas.drawBitmap(image, 0, 0, null);
+        return whiteBgBitmap;
+
+    }
+
+    public static Bitmap aspectSafeScale(Bitmap image, int maxWidth, int maxHeight) {
+
+        int width = image.getWidth();
+        int height = image.getHeight();
+
+        if (width == maxWidth && height == maxHeight) {
+            return image;
+        }
+
+        if (width > height) {
+            // landscape
+            float ratio = (float) width / maxWidth;
+            width = maxWidth;
+            height = (int) (height / ratio);
+
+        } else if (height > width) {
+            // portrait
+            float ratio = (float) height / maxHeight;
+            height = maxHeight;
+            width = (int) (width / ratio);
+
+        }
+        return Bitmap.createScaledBitmap(image, width, height, true);
+    }
+}
diff --git a/app/src/main/res/layout/fragment_additional_info.xml b/app/src/main/res/layout/fragment_additional_info.xml
index fd2ed2b0..977a2e3e 100644
--- a/app/src/main/res/layout/fragment_additional_info.xml
+++ b/app/src/main/res/layout/fragment_additional_info.xml
@@ -48,6 +48,7 @@
     <com.rockthevote.grommet.ui.misc.BetterSpinner
         android:id="@+id/spinner_race"
         android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_columnSpan="2"
         android:layout_gravity="fill_horizontal"
         android:layout_marginEnd="@dimen/content_margin"
@@ -58,6 +59,7 @@
     <com.rockthevote.grommet.ui.misc.BetterSpinner
         android:id="@+id/spinner_party"
         android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_columnSpan="2"
         android:layout_gravity="fill_horizontal"
         android:layout_marginEnd="@dimen/content_margin"
@@ -66,6 +68,28 @@
         android:paddingBottom="@dimen/content_area_padding"
         app:errorEnabled="false"/>
 
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/til_other_party"
+        android:layout_width="0dip"
+        android:layout_columnSpan="2"
+        android:layout_gravity="fill_horizontal"
+        android:layout_marginEnd="@dimen/content_margin"
+        android:layout_marginStart="@dimen/content_margin"
+        android:visibility="gone"
+        app:errorEnabled="false"
+        tools:visibility="visible"
+        >
+
+        <android.support.design.widget.TextInputEditText
+            android:id="@+id/other_party_edit_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/label_other_party"
+            android:inputType="textCapWords"
+            android:maxLines="1"/>
+
+    </android.support.design.widget.TextInputLayout>
+
     <TextView
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 17690387..8b8be286 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,74 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    
+
     <string-array name="pa_counties">
-        <item>Adams County</item>
-        <item>Allegheny County</item>
-        <item>Armstrong County</item>
-        <item>Beaver County</item>
-        <item>Bedford County</item>
-        <item>Berks County</item>
-        <item>Blair County</item>
-        <item>Bradford County</item>
-        <item>Bucks County</item>
-        <item>Butler County</item>
-        <item>Cambria County</item>
-        <item>Cameron County</item>
-        <item>Carbon County</item>
-        <item>Centre County</item>
-        <item>Chester County</item>
-        <item>Clarion County</item>
-        <item>Clearfield County</item>
-        <item>Clinton County</item>
-        <item>Columbia County</item>
-        <item>Crawford County</item>
-        <item>Cumberland County</item>
-        <item>Dauphin County</item>
-        <item>Delaware County</item>
-        <item>Elk County</item>
-        <item>Erie County</item>
-        <item>Fayette County</item>
-        <item>Forest County</item>
-        <item>Franklin County</item>
-        <item>Fulton County</item>
-        <item>Greene County</item>
-        <item>Huntingdon County</item>
-        <item>Indiana County</item>
-        <item>Jefferson County</item>
-        <item>Juniata County</item>
-        <item>Lackawanna County</item>
-        <item>Lancaster County</item>
-        <item>Lawrence County</item>
-        <item>Lebanon County</item>
-        <item>Lehigh County</item>
-        <item>Luzerne County</item>
-        <item>Lycoming County</item>
-        <item>McKean County</item>
-        <item>Mercer County</item>
-        <item>Mifflin County</item>
-        <item>Monroe County</item>
-        <item>Montgomery County</item>
-        <item>Montour County</item>
-        <item>Northampton County</item>
-        <item>Northumberland County</item>
-        <item>Perry County</item>
-        <item>Philadelphia County</item>
-        <item>Pike County</item>
-        <item>Potter County</item>
-        <item>Schuylkill County</item>
-        <item>Snyder County</item>
-        <item>Somerset County</item>
-        <item>Sullivan County</item>
-        <item>Susquehanna County</item>
-        <item>Tioga County</item>
-        <item>Union County</item>
-        <item>Venango County</item>
-        <item>Warren County</item>
-        <item>Washington County</item>
-        <item>Wayne County</item>
-        <item>Westmoreland County</item>
-        <item>Wyoming County</item>
-        <item>York County</item>
+        <item>Adams</item>
+        <item>Allegheny</item>
+        <item>Armstrong</item>
+        <item>Beaver</item>
+        <item>Bedford</item>
+        <item>Berks</item>
+        <item>Blair</item>
+        <item>Bradford</item>
+        <item>Bucks</item>
+        <item>Butler</item>
+        <item>Cambria</item>
+        <item>Cameron</item>
+        <item>Carbon</item>
+        <item>Centre</item>
+        <item>Chester</item>
+        <item>Clarion</item>
+        <item>Clearfield</item>
+        <item>Clinton</item>
+        <item>Columbia</item>
+        <item>Crawford</item>
+        <item>Cumberland</item>
+        <item>Dauphin</item>
+        <item>Delaware</item>
+        <item>Elk</item>
+        <item>Erie</item>
+        <item>Fayette</item>
+        <item>Forest</item>
+        <item>Franklin</item>
+        <item>Fulton</item>
+        <item>Greene</item>
+        <item>Huntingdon</item>
+        <item>Indiana</item>
+        <item>Jefferson</item>
+        <item>Juniata</item>
+        <item>Lackawanna</item>
+        <item>Lancaster</item>
+        <item>Lawrence</item>
+        <item>Lebanon</item>
+        <item>Lehigh</item>
+        <item>Luzerne</item>
+        <item>Lycoming</item>
+        <item>Mckean</item>
+        <item>Mercer</item>
+        <item>Mifflin</item>
+        <item>Monroe</item>
+        <item>Montgomery</item>
+        <item>Montour</item>
+        <item>Northampton</item>
+        <item>Northumberland</item>
+        <item>Perry</item>
+        <item>Philadelphia</item>
+        <item>Pike</item>
+        <item>Potter</item>
+        <item>Schuylkill</item>
+        <item>Snyder</item>
+        <item>Somerset</item>
+        <item>Sullivan</item>
+        <item>Susquehanna</item>
+        <item>Tioga</item>
+        <item>Union</item>
+        <item>Venango</item>
+        <item>Warren</item>
+        <item>Washington</item>
+        <item>Wayne</item>
+        <item>Westmoreland</item>
+        <item>Wyoming</item>
+        <item>York</item>
     </string-array>
 
     <string-array name="states">
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 46edaa4d..96156da9 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <declare-styleable name="AddressView">
         <attr name="address_type" format="enum">
             <enum name="MAILING" value="1"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4de260a0..cf0602f0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,7 +57,7 @@
     <string name="section_label_personal_info">Address Information</string>
     <string name="section_label_name">Name</string>
     <string name="section_label_previous_name">Previous Name</string>
-    <string name="section_label_registration_address">Registration Address</string>
+    <string name="section_label_registration_address">Residential Address</string>
     <string name="section_label_mailing_address">Mailing Address</string>
     <string name="section_label_previous_address">Previous Address</string>
     <string name="section_label_phone">Phone</string>
@@ -95,6 +95,7 @@
     <!--Additional Info Strings-->
     <string name="label_preferred_language">Preferred Language</string>
     <string name="label_drivers_license_id">PennDOT number</string>
+    <string name="label_other_party">Other Political Party</string>
     <string name="label_does_not_have_penn_dot">I do not know my PennDOT number</string>
     <string name="label_ssn_last_four">SSN Last Four</string>
     <string name="label_does_not_have_ssn">I do not know the last four of my SSN</string>
@@ -240,6 +241,9 @@ Submitting an application containing false information may also subject a person
 
     <string name="upload_notification_title_success">PA Registration Success</string>
     <string name="upload_notification_title_failure">PA Registration Failed</string>
+    <string name="upload_notification_content_success">Registration submitted</string>
+    <string name="upload_notification_content_client_failure">Bad registration data</string>
+    <string name="upload_notification_content_connection_failure">Unable to contact server</string>
 
     <string name="about_activity_text">
 <![CDATA[