diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-08-03 23:00:06 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-08-03 23:00:06 +0200 |
commit | 71aa88f3702aa293b35832956f9d38481deff47c (patch) | |
tree | ef775b2d66fc1a92c08c89bb63b40d88f8e077f2 /src/main/java/de/pixart/messenger/services/XmppConnectionService.java | |
parent | 316b0203f8b68242ccd19bbf4f31e776fad5875a (diff) |
some changes in Updater
Diffstat (limited to 'src/main/java/de/pixart/messenger/services/XmppConnectionService.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index 068384a60..e50f0d9e2 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -169,6 +169,9 @@ public class XmppConnectionService extends Service { public static final String ACTION_FCM_MESSAGE_RECEIVED = "fcm_message_received"; private static final String ACTION_MERGE_PHONE_CONTACTS = "merge_phone_contacts"; private static final String SETTING_LAST_ACTIVITY_TS = "last_activity_timestamp"; + public static final String FDroid = "org.fdroid.fdroid"; + public static final String PlayStore = "com.android.vending"; + public static final String Yalp = "com.github.yeriomin.yalpstore"; static { URL.setURLStreamHandlerFactory(new CustomURLStreamHandlerFactory()); @@ -4307,20 +4310,16 @@ public class XmppConnectionService extends Service { } } - public boolean installedFromFDroid() { + public String installedFrom() { final PackageManager packageManager = this.getPackageManager(); final String packageID = BuildConfig.APPLICATION_ID; final String installedFrom = packageManager.getInstallerPackageName(packageID); Log.d(Config.LOGTAG, "Messenger installed from " + installedFrom); - return installedFrom != null && installedFrom.contains("org.fdroid.fdroid"); - } - - public boolean installedFromPlayStore() { - final PackageManager packageManager = this.getPackageManager(); - final String packageID = BuildConfig.APPLICATION_ID; - final String installedFrom = packageManager.getInstallerPackageName(packageID); - Log.d(Config.LOGTAG, "Messenger installed from " + installedFrom); - return installedFrom != null && (installedFrom.contains("com.android.vending") || installedFrom.contains("com.github.yeriomin.yalpstore")); + if (installedFrom != null) { + return installedFrom; + } else { + return null; + } } public ShortcutService getShortcutService() { |