Make sender ID optional

aerogear · May 2, 2016 · 706c84c · 706c84c
1 parent 6476891
commit 706c84c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 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