Skip to content
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.

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

Prevent security exception when creating account on Android 7 #108

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<string name="app_name">Birthday Adapter JB Workaround</string>
<string name="label">Birthday Adapter</string>
<string name="authenticator_activity">org.birthdayadapter.ui.CreateAccountActivity</string>
<string name="account_type">org.birthdayadapter.account</string>
<string name="account_type">org.birthdayadapter.auth</string>
<string name="package_name">org.birthdayadapter</string>
<string name="real_app_name">Birthday Adapter</string>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class Constants {
public static final String FULL_PACKAGE_NAME = "org.birthdayadapter";

public static final String ACCOUNT_NAME = "Birthday Adapter";
public static final String ACCOUNT_TYPE = "org.birthdayadapter.account";
public static final String ACCOUNT_TYPE = "org.birthdayadapter.auth";
public static final String CONTENT_AUTHORITY = "com.android.calendar";

public static final Account ACCOUNT = new Account(ACCOUNT_NAME, ACCOUNT_TYPE);
Expand Down
2 changes: 1 addition & 1 deletion Birthday-Calendar/src/main/res/xml/authenticator.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountPreferences="@xml/account_preferences"
android:accountType="org.birthdayadapter.account"
android:accountType="org.birthdayadapter.auth"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:smallIcon="@mipmap/ic_launcher" />
2 changes: 1 addition & 1 deletion Birthday-Calendar/src/main/res/xml/sync_calendar.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="org.birthdayadapter.account"
android:accountType="org.birthdayadapter.auth"
android:contentAuthority="com.android.calendar"
android:supportsUploading="false" />