diff --git a/app/build.gradle b/app/build.gradle index 14f9a61b..65b9caf5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,10 +24,7 @@ android { productFlavors { standard { - versionName "1.2" - } - gplay { - versionName "1.2-gplay" + versionName "1.2-ose" } } diff --git a/app/src/gplay/res/menu/activity_accounts_drawer.xml b/app/src/gplay/res/menu/activity_accounts_drawer.xml deleted file mode 100644 index aba01f63..00000000 --- a/app/src/gplay/res/menu/activity_accounts_drawer.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java index a0017798..3abb0e83 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java @@ -96,8 +96,7 @@ public class AccountsActivity extends AppCompatActivity implements NavigationVie startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("forums/").build())); break; case R.id.nav_donate: - if (BuildConfig.FLAVOR != App.FLAVOR_GOOGLE_PLAY) - startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("donate/").build())); + startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("donate/").build())); break; } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.java index 1550ed23..d44b672d 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.java @@ -75,7 +75,6 @@ public class AppSettingsActivity extends AppCompatActivity { private void resetHints() { @Cleanup ServiceDB.OpenHelper dbHelper = new ServiceDB.OpenHelper(getContext()); Settings settings = new Settings(dbHelper.getWritableDatabase()); - settings.remove(StartupDialogFragment.HINT_GOOGLE_PLAY_ACCOUNTS_REMOVED); settings.remove(StartupDialogFragment.HINT_OPENTASKS_NOT_INSTALLED); Snackbar.make(getView(), R.string.app_settings_reset_hints_success, Snackbar.LENGTH_LONG).show(); } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java index d480387e..095a2f3e 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java @@ -37,7 +37,6 @@ import lombok.Cleanup; public class StartupDialogFragment extends DialogFragment { public static final String - HINT_GOOGLE_PLAY_ACCOUNTS_REMOVED = "hint_GooglePlayAccountsRemoved", HINT_OPENTASKS_NOT_INSTALLED = "hint_OpenTasksNotInstalled"; private static final String ARGS_MODE = "mode"; @@ -45,7 +44,6 @@ public class StartupDialogFragment extends DialogFragment { enum Mode { DEVELOPMENT_VERSION, FDROID_DONATE, - GOOGLE_PLAY_ACCOUNTS_REMOVED, OPENTASKS_NOT_INSTALLED } @@ -57,20 +55,8 @@ public class StartupDialogFragment extends DialogFragment { if (BuildConfig.VERSION_NAME.contains("-alpha") || BuildConfig.VERSION_NAME.contains("-beta") || BuildConfig.VERSION_NAME.contains("-rc")) dialogs.add(StartupDialogFragment.instantiate(Mode.DEVELOPMENT_VERSION)); - else { - // store-specific information - if (BuildConfig.FLAVOR == App.FLAVOR_GOOGLE_PLAY) { - // Play store - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP && // only on Android <5 - settings.getBoolean(HINT_GOOGLE_PLAY_ACCOUNTS_REMOVED, true)) // and only when "Don't show again" hasn't been clicked yet - dialogs.add(StartupDialogFragment.instantiate(Mode.GOOGLE_PLAY_ACCOUNTS_REMOVED)); - } else { - // other stores - final String installedFrom = installedFrom(context); - if (installedFrom == null || installedFrom.startsWith("org.fdroid")) - dialogs.add(StartupDialogFragment.instantiate(Mode.FDROID_DONATE)); - } - } + else + dialogs.add(StartupDialogFragment.instantiate(Mode.FDROID_DONATE)); // OpenTasks information if (!LocalTaskList.tasksProviderAvailable(context) && @@ -117,54 +103,19 @@ public class StartupDialogFragment extends DialogFragment { .create(); case FDROID_DONATE: - if (BuildConfig.FLAVOR != App.FLAVOR_GOOGLE_PLAY) - return new AlertDialog.Builder(getActivity()) - .setIcon(R.drawable.ic_launcher) - .setTitle(R.string.startup_donate) - .setMessage(R.string.startup_donate_message) - .setPositiveButton(R.string.startup_donate_now, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("donate/").build())); - } - }) - .setNegativeButton(R.string.startup_donate_later, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - } - }) - .create(); - else - throw new IllegalArgumentException(); - - case GOOGLE_PLAY_ACCOUNTS_REMOVED: - Drawable icon = null; - try { - icon = getContext().getPackageManager().getApplicationIcon("com.android.vending").getCurrent(); - } catch (PackageManager.NameNotFoundException e) { - App.log.log(Level.WARNING, "Can't load Play Store icon", e); - } return new AlertDialog.Builder(getActivity()) - .setIcon(icon) - .setTitle(R.string.startup_google_play_accounts_removed) - .setMessage(R.string.startup_google_play_accounts_removed_message) - .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - } - }) - .setNeutralButton(R.string.startup_google_play_accounts_removed_more_info, new DialogInterface.OnClickListener() { + .setIcon(R.drawable.ic_launcher) + .setTitle(R.string.startup_donate) + .setMessage(R.string.startup_donate_message) + .setPositiveButton(R.string.startup_donate_now, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - Intent intent = new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("faq/").build()); - getContext().startActivity(intent); + startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("donate/").build())); } }) - .setNegativeButton(R.string.startup_dont_show_again, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.startup_donate_later, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - Settings settings = new Settings(dbHelper.getWritableDatabase()); - settings.putBoolean(HINT_GOOGLE_PLAY_ACCOUNTS_REMOVED, false); } }) .create(); diff --git a/build.gradle b/build.gradle index 90c4890e..8d038061 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.1.2' } }