Merge pull request #92 from alexstyl/develop

Release 7.2
alexstyl · Mar 9, 2017 · 84a4e51 · 84a4e51
2 parents 4226ec1 + 781b326
commit 84a4e51
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -28,6 +28,6 @@ task clean(type: Delete) {
 ext {
     androidCompileSdkVersion = 24
     androidBuildToolsVersion = '24.0.2'
-    androidVersionCode = 67
-    androidVersionName = '7.1'
+    androidVersionCode = 68
+    androidVersionName = '7.2'
 }
diff --git a/mobile/src/main/java/com/alexstyl/specialdates/contact/DeviceContact.java b/mobile/src/main/java/com/alexstyl/specialdates/contact/DeviceContact.java
@@ -58,7 +58,7 @@ public void displayQuickInfo(Context context) {
 
     @Override
     protected List<LabeledAction> onBuildActions(Context context) {
-        final ContentResolver resolver = context.getContentResolver();
+        ContentResolver resolver = context.getContentResolver();
         boolean hasPhoneNumber = ContactUtils.hasPhoneNumber(resolver, getContactID());
         List<LabeledAction> actions = new ArrayList<>(2);
         if (hasPhoneNumber) {

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/datedetails/DateDetailsAdapter.java b/mobile/src/main/java/com/alexstyl/specialdates/datedetails/DateDetailsAdapter.java
@@ -260,7 +260,7 @@ public void onViewDetachedFromWindow(RecyclerView.ViewHolder holder) {
         dayHolder.clearActions();
     }
 
-    public ContactEvent getEvent(int position) {
+    private ContactEvent getEvent(int position) {
         int eventPosition = getEventPositionFrom(position);
         return events.get(eventPosition);
     }

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/datedetails/DateDetailsFragment.java b/mobile/src/main/java/com/alexstyl/specialdates/datedetails/DateDetailsFragment.java
@@ -112,7 +112,6 @@ public void onContactActionsMenuClicked(View view, Contact contact) {
             for (int i = 0; i < size; i++) {
                 LabeledAction action = actions.get(i);
                 popup.getMenu().add(contact.hashCode(), i, 0, getString(action.getName()));
-                i++;
             }
 
             popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {