refactor code based on api changes (#518)

mozilla-release/mobile/android/app/src/bond/java/org/mozilla/gecko/authentication/LoginHelper.java

@@ -15,9 +15,11 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
+import com.google.protobuf.GeneratedMessageLite;
+
 import org.mozilla.gecko.Error;
 import org.mozilla.gecko.ErrorCode;
-import com.google.protobuf.GeneratedMessageLite;
 import org.mozilla.gecko.IsDeviceActivatedResponse;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Response;
@@ -138,7 +140,7 @@ public void onServerReplied(GeneratedMessageLite serverResponse, TalkToServer.Ca
             case RESEND_ACTIVATION:
                 if (((Response)serverResponse).getErrorCount() > 0) {
                     Log.e(LOGTAG, "can't resend the activation again");
-                    if (serverResponse.getErrorList().get(0).getCode() == ErrorCode
+                    if (((Response)serverResponse).getErrorList().get(0).getCode() == ErrorCode
                             .NO_INTERNET_CONNECTION) {
                         mErrorMessageTextView.setText(mActivity.getString(R.string
                                 .error_no_internet_connection));

mozilla-release/mobile/android/app/src/bond/java/org/mozilla/gecko/authentication/TalkToServer.java

@@ -24,7 +24,7 @@
 public class TalkToServer extends AsyncTask<Void, Void, GeneratedMessageLite> {
 
     public interface ServerCallbacks {
-        void onServerReplied(GeneratedMessageLite serverResponse, GeneratedMessageLite whichCase);
+        void onServerReplied(GeneratedMessageLite serverResponse, Cases whichCase);
     }
 
     private static final String LOGTAG = TalkToServer.class.getSimpleName();

mozilla-release/mobile/android/app/src/bond/proto/bond_server.proto

@@ -9,11 +9,11 @@ service BondV1 {
   rpc GetDevices(UserAuth) returns (GetDevicesResponse);
   rpc UnregisterDevice(UnregisterDeviceRequest) returns (Response);
   rpc ResendActivationEmail(UserAuth) returns (Response);
-  rpc IsDeviceActivated(UserAuth) returns (Response);
+  rpc IsDeviceActivated(UserAuth) returns (IsDeviceActivatedResponse);
   rpc RequestDelete(UserAuth) returns (Response);
 
   // Subscription management
-  rpc GetSubscriptions(UserAuth) returns (Subscriptions);
+  rpc GetSubscription(UserAuth) returns (GetSubscriptionResponse);
   rpc Subscribe(SubscribeRequest) returns (Response);
   rpc Unsubscribe(UnsubscribeRequest) returns (Response);
 
@@ -41,9 +41,10 @@ enum ErrorCode {
 }
 
 enum SubscriptionType {
-  TRIAL = 0;
-  TRIAL_CODE = 1;
-  PREMIUM_MONTHLY = 2;
+  BASIC = 0;
+  TRIAL = 1;
+  TRIAL_CODE = 2;
+  PREMIUM_MONTHLY = 3;
 }
 
 message Error {
@@ -73,6 +74,11 @@ message UnregisterDeviceRequest {
   int64 deviceId = 2;
 }
 
+message IsDeviceActivatedResponse {
+  repeated Error error = 1;
+  int64 deviceId = 2;
+}
+
 message Device {
   int64 id = 1;
   string description = 2;
@@ -113,9 +119,9 @@ message Subscription {
   int64 id = 3;
 }
 
-message Subscriptions {
+message GetSubscriptionResponse {
   repeated Error error = 1;
-  repeated Subscription subscriptions = 2;
+  Subscription subscription = 2;
 }
 
 message SubscribeRequest {