Skip to content

Commit e029c7f

Browse files
gorbingorbin
committed
work in progress
1 parent 1e38da1 commit e029c7f

File tree

4 files changed

+55
-34
lines changed

4 files changed

+55
-34
lines changed

‎.gitattributes

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
*.sln merge=union
7+
*.csproj merge=union
8+
*.vbproj merge=union
9+
*.fsproj merge=union
10+
*.dbproj merge=union
11+
12+
# Standard to msysgit
13+
*.doc diff=astextplain
14+
*.DOC diff=astextplain
15+
*.docx diff=astextplain
16+
*.DOCX diff=astextplain
17+
*.dot diff=astextplain
18+
*.DOT diff=astextplain
19+
*.pdf diff=astextplain
20+
*.PDF diff=astextplain
21+
*.rtf diff=astextplain
22+
*.RTF diff=astextplain

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
/.idea/workspace.xml
44
.DS_Store
55
/third_party/facebook/build/
6-
76
/third_party/facebook/build/libs/
87

98
# built application files
@@ -41,4 +40,5 @@ proguard/
4140
Thumbs.db
4241
gradle/
4342

44-
third_party/facebook/build/libs/facebook.aar
43+
third_party/facebook/build/libs/facebook.aar
44+
build/

‎build/intermediates/dex-cache/cache.xml

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<pre-dex-items>
33

4-
<item
5-
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\classes-0c7a915e4a83b566a0c724b20456c80dabd65612.jar"
6-
jar="D:\develop\ASNE\ASNE\build\intermediates\exploded-aar\ASNE\facebook\unspecified\classes.jar"
7-
jumboMode="false"
8-
revision="19.1.0"
9-
sha1="9e29e49efb56a0662e1116a13248f51d0a34e0bf"/>
104
<item
115
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\odnoklassniki-android-sdk-9fc4a600a74f7d68bea0b77bcac0104b41a3d0e5.jar"
126
jar="D:\develop\ASNE\ASNE\build\intermediates\exploded-aar\com.github.androidsocialnetworks\library\0.3.0\libs\odnoklassniki-android-sdk.jar"
137
jumboMode="false"
148
revision="19.1.0"
159
sha1="bced1249c361940d60e415fca5782e6b30ae05c1"/>
16-
<item
17-
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\signpost-commonshttp4-1.2.1.1-6a151127730df415bfb04dba7ab8035926a59a9b.jar"
18-
jar="D:\develop\ASNE\ASNE\build\intermediates\exploded-aar\com.github.androidsocialnetworks\library\0.3.0\libs\signpost-commonshttp4-1.2.1.1.jar"
19-
jumboMode="false"
20-
revision="19.1.0"
21-
sha1="1e6380adcb5808bfe13a934a2f35bfeed1adbc49"/>
22-
<item
23-
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\support-v4-19.1.0-c4c1da5f9202a293888e5a5b5d9128899a5d3738.jar"
24-
jar="D:\programs\AndroidStudio\sdk\extras\android\m2repository\com\android\support\support-v4\19.1.0\support-v4-19.1.0.jar"
25-
jumboMode="false"
26-
revision="19.1.0"
27-
sha1="85f201b380937e61a9dce6ca90ccf6872abbfb67"/>
28-
<item
29-
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\picasso-2.2.0-0b7481ee0f5a8d3c73a6c688881dea1c303d815e.jar"
30-
jar="D:\develop\ASNE\ASNE\libs\picasso-2.2.0.jar"
31-
jumboMode="false"
32-
revision="19.1.0"
33-
sha1="74137f8d9aac26dd9463efe32271f2be8d41cda9"/>
3410
<item
3511
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\classes-020d97f2b00ed3bab830f25443b399283f022883.jar"
3612
jar="D:\develop\ASNE\ASNE\build\intermediates\exploded-aar\com.android.support\appcompat-v7\19.1.0\classes.jar"
@@ -55,12 +31,42 @@
5531
jumboMode="false"
5632
revision="19.1.0"
5733
sha1="37fd1d1eb3ed57916c9fdd1ea1f6c3afce778c7c"/>
34+
<item
35+
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\bugsense-3.6.1-277251378dd44ed31d9732b65fb4d1169cf79042.jar"
36+
jar="D:\develop\ASNE\ASNE\libs\bugsense-3.6.1.jar"
37+
jumboMode="false"
38+
revision="19.1.0"
39+
sha1="bf354591194bef969ec162609bd1cc279d2d113b"/>
40+
<item
41+
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\classes-0c7a915e4a83b566a0c724b20456c80dabd65612.jar"
42+
jar="D:\develop\ASNE\ASNE\build\intermediates\exploded-aar\ASNE\facebook\unspecified\classes.jar"
43+
jumboMode="false"
44+
revision="19.1.0"
45+
sha1="9e29e49efb56a0662e1116a13248f51d0a34e0bf"/>
46+
<item
47+
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\signpost-commonshttp4-1.2.1.1-6a151127730df415bfb04dba7ab8035926a59a9b.jar"
48+
jar="D:\develop\ASNE\ASNE\build\intermediates\exploded-aar\com.github.androidsocialnetworks\library\0.3.0\libs\signpost-commonshttp4-1.2.1.1.jar"
49+
jumboMode="false"
50+
revision="19.1.0"
51+
sha1="1e6380adcb5808bfe13a934a2f35bfeed1adbc49"/>
52+
<item
53+
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\support-v4-19.1.0-c4c1da5f9202a293888e5a5b5d9128899a5d3738.jar"
54+
jar="D:\programs\AndroidStudio\sdk\extras\android\m2repository\com\android\support\support-v4\19.1.0\support-v4-19.1.0.jar"
55+
jumboMode="false"
56+
revision="19.1.0"
57+
sha1="85f201b380937e61a9dce6ca90ccf6872abbfb67"/>
58+
<item
59+
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\picasso-2.2.0-0b7481ee0f5a8d3c73a6c688881dea1c303d815e.jar"
60+
jar="D:\develop\ASNE\ASNE\libs\picasso-2.2.0.jar"
61+
jumboMode="false"
62+
revision="19.1.0"
63+
sha1="74137f8d9aac26dd9463efe32271f2be8d41cda9"/>
5864
<item
5965
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\classes-4a5e089baad9b8a3a2d0f8b7721b1a2099f6ac78.jar"
6066
jar="D:\develop\ASNE\ASNE\build\intermediates\exploded-aar\com.github.androidsocialnetworks\library\0.3.0\classes.jar"
6167
jumboMode="false"
6268
revision="19.1.0"
63-
sha1="a3b059ab97f1ef04889073fdb9ff3c73554cd9af"/>
69+
sha1="d3f62b55dbb97e2bda960f67fc55162c7824225c"/>
6470
<item
6571
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\classes-465cad54701692e2663b0da8f653191d1ccaaeb2.jar"
6672
jar="D:\develop\ASNE\ASNE\build\intermediates\exploded-aar\ASNE\iconify_custom\unspecified\classes.jar"
@@ -91,11 +97,5 @@
9197
jumboMode="false"
9298
revision="19.1.0"
9399
sha1="7676c0cb230efa6ac41c47867d372ed5913029d4"/>
94-
<item
95-
dex="D:\develop\ASNE\ASNE\build\intermediates\pre-dexed\debug\bugsense-3.6.1-277251378dd44ed31d9732b65fb4d1169cf79042.jar"
96-
jar="D:\develop\ASNE\ASNE\libs\bugsense-3.6.1.jar"
97-
jumboMode="false"
98-
revision="19.1.0"
99-
sha1="bf354591194bef969ec162609bd1cc279d2d113b"/>
100100

101101
</pre-dex-items>

‎library/src/main/java/com/androidsocialnetworks/lib/impl/GooglePlusSocialNetwork.java

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public class GooglePlusSocialNetwork extends SocialNetwork implements GooglePlay
5151
* so let's handle state by ourselves
5252
*/
5353
private static final String SAVE_STATE_KEY_IS_CONNECTED = "GooglePlusSocialNetwork.SAVE_STATE_KEY_OAUTH_TOKEN";
54-
private static final String MESSAGE = "SocialNetwork.MESSAGE";
5554
private GoogleApiClient googleApiClient;
5655
private ConnectionResult mConnectionResult;
5756

0 commit comments

Comments
 (0)