diff --git a/metadata/org.fox.ttrss.txt b/metadata/org.fox.ttrss.txt index db0b3ea61f..24e7189348 100644 --- a/metadata/org.fox.ttrss.txt +++ b/metadata/org.fox.ttrss.txt @@ -13,7 +13,8 @@ read the feeds. Don't forget to enable API access in your tt-rss account preferences (Preferences -> Advanced -> Enable external API). The source code for 1.10+ allows the app to be used only for a trial period, -after which a key must be purchased. This limitation is removed in this build. +after which a key must be purchased. This anti-feature has been patched out in +our builds. . Repo Type:git @@ -56,6 +57,13 @@ ActionBarSherlock@4.3.0;ViewPagerIndicator@2.4.1,prebuild=sed -i -e \ 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' project.properties && \ cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \ cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs +Build Version:1.8.1,181,068bc6bb81011364fc605d,patch=notrial_new.patch,srclibs=\ +ActionBarSherlock@4.3.1;ViewPagerIndicator@2.4.1;SlidingMenu@8fcae2cce29e,prebuild=\ +sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' \ +-e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \ +cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \ +cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \ +cp libs/android-support-v4.jar $$SlidingMenu$$/libs Auto Update Mode:None Update Check Mode:Market diff --git a/metadata/org.fox.ttrss/notrial_new.patch b/metadata/org.fox.ttrss/notrial_new.patch new file mode 100644 index 0000000000..b453f4a455 --- /dev/null +++ b/metadata/org.fox.ttrss/notrial_new.patch @@ -0,0 +1,157 @@ +diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml +index 282da0c..6364c00 100644 +--- a/res/menu/main_menu.xml ++++ b/res/menu/main_menu.xml +@@ -138,11 +138,6 @@ + android:title="@string/article_set_unread"/> + + +- +- + + + firstStart + (TRIAL_DAYS * 24 * 60 * 60 * 1000)) { +- +- AlertDialog.Builder builder = new AlertDialog.Builder(this) +- .setTitle(R.string.trial_expired) +- .setMessage(R.string.trial_expired_message) +- .setCancelable(false) +- .setPositiveButton(getString(R.string.trial_purchase), +- new OnClickListener() { +- @Override +- public void onClick(DialogInterface dialog, +- int which) { +- +- openUnlockUrl(); +- finish(); +- +- } +- }) +- .setNegativeButton(getString(R.string.cancel), +- new OnClickListener() { +- @Override +- public void onClick(DialogInterface dialog, +- int which) { +- +- finish(); +- +- } +- }); +- +- AlertDialog dialog = builder.create(); +- dialog.show(); +- +- } else { +- long daysLeft = Math.round((firstStart + (TRIAL_DAYS * 24 * 60 * 60 * 1000) - System.currentTimeMillis()) / (24 * 60 * 60 * 1000)); +- +- if (notify) { +- toast(getString(R.string.trial_mode_prompt, Long.valueOf(daysLeft))); +- } +- } +- } else if (notify) { +- //toast(R.string.trial_thanks); +- } +- } +- +- private void openUnlockUrl() { +- try { +- Intent intent = new Intent(Intent.ACTION_VIEW, +- Uri.parse("market://details?id=org.fox.ttrss.key")); +- startActivity(intent); +- } catch (ActivityNotFoundException ae) { +- try { +- Intent intent = new Intent(Intent.ACTION_VIEW, +- Uri.parse("https://play.google.com/store/apps/details?id=org.fox.ttrss.key")); +- startActivity(intent); +- } catch (Exception e) { +- e.printStackTrace(); +- toast(R.string.error_other_error); +- } +- } +- } +- + @Override + public boolean onContextItemSelected(android.view.MenuItem item) { + /* AdapterContextMenuInfo info = (AdapterContextMenuInfo) item +@@ -694,11 +617,6 @@ public class OnlineActivity extends CommonActivity { + } + } + return true; +- case R.id.donate: +- if (true) { +- openUnlockUrl(); +- } +- return true; + case R.id.logout: + logout(); + return true; +@@ -1227,14 +1145,6 @@ public class OnlineActivity extends CommonActivity { + List pkgs = getPackageManager() + .getInstalledPackages(0); + +- for (PackageInfo p : pkgs) { +- if ("org.fox.ttrss.key".equals(p.packageName)) { +- Log.d(TAG, "license apk found"); +- menu.findItem(R.id.donate).setVisible(false); +- break; +- } +- } +- + return true; + } +