Merge pull request #710 from matzew/AGPUSH-1611

Agpush 1611
aerogear · May 8, 2016 · 5b69d79 · 5b69d79
2 parents 77283fa + 0f6060c
commit 5b69d79
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/admin-ui/app/dialogs/create-variant.html b/admin-ui/app/dialogs/create-variant.html
@@ -120,7 +120,7 @@ <h4 class="modal-title" id="myModalLabel">{{ isNew ? 'Add' : 'Edit' }} Variant</
           <label class="col-sm-3 control-label" for="gcmProjectNumber"></label>
           <div class="col-sm-7">
             Project Number<br>
-            <input type="text" placeholder="e.g. 42" id="gcmProjectNumber" class="form-control" ng-model="variant.projectNumber" ng-required="variant.type == 'android'">
+            <input type="text" placeholder="e.g. 42" id="gcmProjectNumber" class="form-control" ng-model="variant.projectNumber">
           </div>
         </div>
       </div>

diff --git a/admin-ui/app/snippets/register-device/android.java b/admin-ui/app/snippets/register-device/android.java
@@ -12,7 +12,7 @@ public class PushApplication extends Application {
 
     private final String VARIANT_ID       = "{{ variant.variantID }}";
     private final String SECRET           = "{{ variant.secret }}";
-    private final String GCM_SENDER_ID    = "{{ variant.projectNumber }}";
+    private final String GCM_SENDER_ID    = {{ variant.projectNumber ? '"' + variant.projectNumber + '";': '""; // getString(R.string.gcm_defaultSenderId)'}}
     private final String UNIFIED_PUSH_URL = "{{ contextPath }}";
 
     @Override

diff --git a/model/api/src/main/java/org/jboss/aerogear/unifiedpush/api/AndroidVariant.java b/model/api/src/main/java/org/jboss/aerogear/unifiedpush/api/AndroidVariant.java
@@ -29,7 +29,7 @@ public class AndroidVariant extends Variant {
     @Size(min = 1, max = 255, message = "Google Cloud Messaging Key must be max. 255 chars long")
     private String googleKey;
 
-    @Size(min = 1, max = 255, message = "Project Number must be max. 255 chars long")
+    @Size(max = 255, message = "Project Number must be max. 255 chars long")
     private String projectNumber;
 
     /**
@@ -64,4 +64,4 @@ public void setGoogleKey(final String googleKey) {
     public VariantType getType() {
         return VariantType.ANDROID;
     }
-}
+}