Skip to content

support building against android-16 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

support building against android-16 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46d680b
support building against android-16
Sep 18, 2013
aca3180
handle the case where a facebook session exists with only publish per…
dtebbs Sep 24, 2013
3314965
upgraded google services sdk to rev 12
dtebbs Oct 30, 2013
8491945
Merge commit '3314965a'
dtebbs Oct 30, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions OpenKitSDK/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

<uses-sdk
android:minSdkVersion="8"
android:targetSdkVersion="17" />
android:targetSdkVersion="16" />

<application
android:allowBackup="true"
android:label="@string/io_openkit_sdk_app_name"
android:theme="@style/AppTheme" >
</application>

</manifest>
</manifest>
Binary file modified OpenKitSDK/libs/google-play-services.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion OpenKitSDK/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-17
target=android-16
android.library=true
6 changes: 2 additions & 4 deletions OpenKitSDK/res/layout/io_openkit_fragment_fbprompt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/io_openkit_fbprompt_title"
android:textAlignment="center" />
android:text="@string/io_openkit_fbprompt_title" />

<TextView
android:id="@+id/io_openkit_loginSubTitleTextView"
Expand All @@ -41,7 +40,6 @@
android:gravity="center"
android:paddingBottom="10dp"
android:text="@string/io_openkit_fbprompt_subtext"
android:textAlignment="center"
android:textColor="@color/io_openkit_gray" />

<Button
Expand All @@ -66,4 +64,4 @@
android:text="@string/io_openkit_dont_sign_in"
android:textColor="@color/io_openkit_gray" />

</LinearLayout>
</LinearLayout>
8 changes: 3 additions & 5 deletions OpenKitSDK/res/layout/io_openkit_fragment_logindialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/io_openkit_login_text"
android:textAlignment="center" />
android:text="@string/io_openkit_login_text" />

<TextView
android:id="@+id/io_openkit_loginSubTitleTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/io_openkit_login_subtext"
android:textColor="@color/io_openkit_gray"
android:textAlignment="center" />
android:textColor="@color/io_openkit_gray" />

<Button
android:id="@+id/io_openkit_googleSignInButton"
Expand Down Expand Up @@ -116,4 +114,4 @@
android:indeterminateOnly="true"
android:visibility="invisible" />

</RelativeLayout>
</RelativeLayout>
15 changes: 13 additions & 2 deletions OpenKitSDK/src/io/openkit/facebookutils/FBLoginRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,19 @@ public void loginToFacebook(Fragment fragment)
}
else if(session.isOpened())
{
//Facebook session is already open, just authorize the user with OpenKit
requestHandler.onFBLoginSucceeded();
//Facebook session is already open. Ensure we have the
//proper permissions, and authorize the user with OpenKit.

if (session.getPermissions().contains("basic_info")) {
requestHandler.onFBLoginSucceeded();
} else {
final java.util.List permList =
java.util.Arrays.asList(new String [] { "basic_info" });
Session.NewPermissionsRequest newPermReq =
new Session.NewPermissionsRequest(fragment, permList)
.setCallback(sessionStatusCallback);
session.requestNewReadPermissions(newPermReq);
}
}
else {
Session.openActiveSession(fragment.getActivity(), fragment, true, sessionStatusCallback);
Expand Down