From fe1f36829fecbfa6acf28f678b1481470152a48a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 7 Jun 2022 19:06:52 +0300 Subject: remove all trial/unlock related code --- org.fox.ttrss/build.gradle | 2 - .../main/java/org/fox/ttrss/MasterActivity.java | 2 - .../main/java/org/fox/ttrss/OnlineActivity.java | 98 +--------------------- org.fox.ttrss/src/main/res/menu/activity_main.xml | 6 -- 4 files changed, 1 insertion(+), 107 deletions(-) diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index b6ebc812..1e09c63c 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -7,7 +7,6 @@ android { defaultConfig { applicationId "org.fox.ttrss" buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L" - buildConfigField "boolean", "ENABLE_TRIAL", "true" buildConfigField "boolean", "ENABLE_UPDATER", "false" minSdkVersion 16 targetSdkVersion 29 @@ -40,7 +39,6 @@ android { minifyEnabled false versionNameSuffix "-fdroid" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - buildConfigField "boolean", "ENABLE_TRIAL", "false" buildConfigField "boolean", "ENABLE_UPDATER", "true" signingConfig signingConfigs.fdroid matchingFallbacks = ['release'] diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index c29e2239..e9404268 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -196,8 +196,6 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList m_feedIsSelected = true; - checkTrial(true); - } else { // savedInstanceState != null if (m_drawerLayout != null && !m_feedIsSelected) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index 2da97902..373360b6 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -61,8 +61,6 @@ import androidx.appcompat.widget.Toolbar; public class OnlineActivity extends CommonActivity { private final String TAG = this.getClass().getSimpleName(); - private final static int TRIAL_DAYS = 8; - protected SharedPreferences m_prefs; protected Menu m_menu; @@ -260,9 +258,8 @@ public class OnlineActivity extends CommonActivity { if (isOffline) { switchOfflineSuccess(); } else { - checkTrial(false); checkUpdates(); - + m_headlinesActionModeCallback = new HeadlinesActionModeCallback(); } } @@ -366,18 +363,6 @@ public class OnlineActivity extends CommonActivity { public void login(boolean refresh, OnLoginFinishedListener listener) { - if (BuildConfig.ENABLE_TRIAL && !BuildConfig.DEBUG) { - String testLabSetting = Settings.System.getString(getContentResolver(), "firebase.test.lab"); - - if ("true".equals(testLabSetting)) { - SharedPreferences.Editor editor = m_prefs.edit(); - editor.putString("ttrss_url", "https://srv.tt-rss.org/tt-rss"); - editor.putString("login", "demo"); - editor.putString("password", "demo"); - editor.apply(); - } - } - if (m_prefs.getString("ttrss_url", "").trim().length() == 0) { setLoadingStatus(R.string.login_need_configure); @@ -434,68 +419,7 @@ public class OnlineActivity extends CommonActivity { finish(); } - - public void checkTrial(boolean notify) { - if (BuildConfig.ENABLE_TRIAL && !BuildConfig.DEBUG) { - - boolean isTrial = getPackageManager().checkSignatures( - getPackageName(), "org.fox.ttrss.key") != PackageManager.SIGNATURE_MATCH; - - if (isTrial) { - long firstStart = m_prefs.getLong("date_firstlaunch_trial", -1); - - if (firstStart == -1) { - firstStart = System.currentTimeMillis(); - - SharedPreferences.Editor editor = m_prefs.edit(); - editor.putLong("date_firstlaunch_trial", firstStart); - editor.apply(); - } - - if (!notify && System.currentTimeMillis() > 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 { - int daysLeft = Math.round((firstStart + (TRIAL_DAYS * 24 * 60 * 60 * 1000) - System.currentTimeMillis()) / (24 * 60 * 60 * 1000)); - - if (notify) { - toast(getResources().getQuantityString(R.plurals.trial_mode_prompt, daysLeft, daysLeft)); - } - } - } else if (notify) { - //toast(R.string.trial_thanks); - } - } - } - private void openUnlockUrl() { try { Intent intent = new Intent(Intent.ACTION_VIEW, @@ -637,11 +561,6 @@ public class OnlineActivity extends CommonActivity { } } return true; */ - case R.id.donate: - if (true) { - openUnlockUrl(); - } - return true; /*case R.id.logout: logout(); return true;*/ @@ -1168,21 +1087,6 @@ public class OnlineActivity extends CommonActivity { m_menu = menu; initMenu(); - - if (BuildConfig.ENABLE_TRIAL && !BuildConfig.DEBUG) { - 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; - } - } - } else { - menu.findItem(R.id.donate).setVisible(false); - } return true; } diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml index 7c5c9465..df66fe75 100755 --- a/org.fox.ttrss/src/main/res/menu/activity_main.xml +++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml @@ -77,12 +77,6 @@ - -