From d688d562f746313f608e66a2b9b3adde6cf2822c Mon Sep 17 00:00:00 2001
From: k0shk0sh <kosh20111@gmail.com>
Date: Sat, 17 Mar 2018 12:04:01 +0100
Subject: [PATCH] fix #1575

---
 app/proguard-rules.pro                                    | 8 +++++++-
 .../fastaccess/data/dao/model/AbstractPinnedGists.java    | 5 ++---
 build.gradle                                              | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index af293c90..2ce4dd23 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -78,6 +78,8 @@
   public *;
 }
 
+-keep class com.google.android.gms.** { *; }
+
 -dontwarn com.github.b3er.**
 -dontwarn com.memoizrlabs.**
 -dontwarn java.lang.FunctionalInterface
@@ -131,4 +133,8 @@
 -dontwarn com.octo.android.robospice.retrofit.RetrofitJackson**
 -dontwarn retrofit.appengine.UrlFetchClient
 -dontwarn icepick.**
--dontwarn com.fastaccess.ui.modules.repos.**
\ No newline at end of file
+-dontwarn com.fastaccess.ui.modules.repos.**
+-dontwarn org.apache.xerces.parsers.**
+-dontwarn oracle.xml.**
+-dontwarn org.jdom.**
+-dontwarn okhttp3.internal.**
\ No newline at end of file
diff --git a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedGists.java b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedGists.java
index 9d399c81..66ce439d 100644
--- a/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedGists.java
+++ b/app/src/main/java/com/fastaccess/data/dao/model/AbstractPinnedGists.java
@@ -32,7 +32,7 @@ import static com.fastaccess.data.dao.model.PinnedGists.LOGIN;
     @io.requery.Nullable long gistId;
 
     public static void pinUpin(@NonNull Gist gist) {
-        PinnedGists pinnedIssues = get(gist.getId());
+        PinnedGists pinnedIssues = get(gist.getGistId().hashCode());
         if (pinnedIssues == null) {
             PinnedGists pinned = new PinnedGists();
             pinned.setLogin(Login.getUser().getLogin());
@@ -42,7 +42,7 @@ import static com.fastaccess.data.dao.model.PinnedGists.LOGIN;
                 App.getInstance().getDataStore().toBlocking().insert(pinned);
             } catch (Exception ignored) {}
         } else {
-            delete(gist.getId());
+            delete(gist.getGistId().hashCode());
         }
     }
 
@@ -73,5 +73,4 @@ import static com.fastaccess.data.dao.model.PinnedGists.LOGIN;
     public static boolean isPinned(long gistId) {
         return get(gistId) != null;
     }
-
 }
diff --git a/build.gradle b/build.gradle
index 1226670c..fb2e0919 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-alpha04'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha06'
         classpath 'com.google.gms:google-services:3.0.0'
         classpath 'com.novoda:gradle-build-properties-plugin:0.3'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2'