Merge commit 'refs/merge-requests/100' of git://gitorious.org/f-droid/fdroiddata into merge-requests/100

This commit is contained in:
Ciaran Gultnieks 2013-02-11 15:20:53 +00:00
commit 9878a33352
3 changed files with 18 additions and 1 deletions

View file

@ -36,7 +36,7 @@ Build Version:0.8.7,108,f460c59b46c61a
Build Version:0.8.10,111,f27bbf9e8c
Build Version:0.8.11,112,7e0c906e2f
Build Version:0.8.14,115,89ee4a84be
Build Version:1.10,132,f0bc21b1a84e8ad3aafdf6768baa6a56ee871b46
Build Version:1.12,134,0d4bd2f4465aa499de1db3d5ee9beb859fff004e,patch=notrial.patch
Auto Update Mode:None
Update Check Mode:Market

View file

@ -0,0 +1,16 @@
Disable the trial version check.
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java
index ef94131..38ecbee 100644
--- a/src/org/fox/ttrss/OnlineActivity.java
+++ b/src/org/fox/ttrss/OnlineActivity.java
@@ -453,8 +453,7 @@ public class OnlineActivity extends CommonActivity {
}
public void checkTrial(boolean notify) {
- boolean isTrial = getPackageManager().checkSignatures(
- getPackageName(), "org.fox.ttrss.key") != PackageManager.SIGNATURE_MATCH;
+ boolean isTrial = false;
if (isTrial) {
long firstStart = m_prefs.getLong("date_firstlaunch_trial", -1);

View file

@ -31,6 +31,7 @@ Build Version:2.2.2,60,825,encoding=utf-8
Build Version:2.2.3,61,833,encoding=utf-8
Build Version:2.2.4,62,847,encoding=utf-8
Build Version:2.2.5,63,858,encoding=utf-8
Build Version:2.2.7,66,884,encoding=utf-8
Auto Update Mode:None
Update Check Mode:Market