Guard against fork event with missing user

kevinsawicki · kevinsawicki · commit cb946df1eb3e · 2012-07-10T15:16:23.000-07:00
This appears to happen if a news feed item is selected
for a fork that has been deleted.
diff --git a/app/src/main/java/com/github/mobile/core/repo/RepositoryEventMatcher.java b/app/src/main/java/com/github/mobile/core/repo/RepositoryEventMatcher.java
@@ -18,6 +18,7 @@
 import static org.eclipse.egit.github.core.event.Event.TYPE_CREATE;
 import static org.eclipse.egit.github.core.event.Event.TYPE_FORK;
 import static org.eclipse.egit.github.core.event.Event.TYPE_WATCH;
+import android.text.TextUtils;
 
 import org.eclipse.egit.github.core.Repository;
 import org.eclipse.egit.github.core.User;
@@ -46,8 +47,15 @@ public Repository getRepository(final Event event) {
             return null;
 
         String type = event.getType();
-        if (TYPE_FORK.equals(type))
-            return ((ForkPayload) payload).getForkee();
+        if (TYPE_FORK.equals(type)) {
+            Repository repository = ((ForkPayload) payload).getForkee();
+            // Verify repository has valid name and owner
+            if (repository != null && !TextUtils.isEmpty(repository.getName())
+                    && repository.getOwner() != null
+                    && !TextUtils.isEmpty(repository.getOwner().getLogin()))
+                return repository;
+        }
+
         if (TYPE_CREATE.equals(type) || TYPE_WATCH.equals(type))
             return getRepository(event.getRepo(), event.getActor());
 
diff --git a/integration-tests/src/main/java/com/github/mobile/tests/tests/repo/RepositoryEventMatcherTest.java b/integration-tests/src/main/java/com/github/mobile/tests/tests/repo/RepositoryEventMatcherTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012 GitHub Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.mobile.tests.tests.repo;
+
+import android.test.AndroidTestCase;
+
+import com.github.mobile.core.repo.RepositoryEventMatcher;
+
+import org.eclipse.egit.github.core.Repository;
+import org.eclipse.egit.github.core.User;
+import org.eclipse.egit.github.core.event.Event;
+import org.eclipse.egit.github.core.event.ForkPayload;
+
+/**
+ * Unit tests of {@link RepositoryEventMatcher}
+ */
+public class RepositoryEventMatcherTest extends AndroidTestCase {
+
+    /**
+     * Test fork event that has an incomplete forkee in the payload
+     */
+    public void testIncompleteRepositoryFork() {
+        RepositoryEventMatcher matcher = new RepositoryEventMatcher();
+        Event event = new Event();
+        event.setType(Event.TYPE_FORK);
+        ForkPayload payload = new ForkPayload();
+        event.setPayload(payload);
+        assertNull(matcher.getRepository(event));
+        Repository repository = new Repository();
+        payload.setForkee(repository);
+        assertNull(matcher.getRepository(event));
+        repository.setName("repo");
+        assertNull(matcher.getRepository(event));
+        repository.setOwner(new User());
+        assertNull(matcher.getRepository(event));
+        repository.getOwner().setLogin("owner");
+        assertEquals(repository, matcher.getRepository(event));
+    }
+
+}
