aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-10-05 16:05:56 +0200
committersteckbrief <steckbrief@chefmail.de>2015-10-05 16:05:56 +0200
commit383d1aa9e64a245f17dd7ec6d177bb286a489f62 (patch)
tree0b9d8a50cab4384063669b794ce91804b0a7545c /src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
parentc3c42e415ddd7832fea66766377fb4f0d935537a (diff)
parent1db6e6d5eadbad04768be823b8dbd32827b9b5c3 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Manually merged conflicting files: src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/ui/AboutPreference.java
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/PhoneHelper.java')
-rw-r--r--src/main/java/eu/siacs/conversations/utils/PhoneHelper.java15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java b/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
index 99e8ebb8..e0556af3 100644
--- a/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
@@ -15,6 +15,8 @@ import android.os.Bundle;
import android.provider.ContactsContract;
import android.provider.ContactsContract.Profile;
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+
public class PhoneHelper {
public static void loadPhoneContacts(Context context,final List<Bundle> phoneContacts, final OnPhoneContactsLoadedListener listener) {
@@ -92,17 +94,4 @@ public class PhoneHelper {
}
}
}
-
- public static String getVersionName(Context context) {
- final String packageName = context == null ? null : context.getPackageName();
- if (packageName != null) {
- try {
- return context.getPackageManager().getPackageInfo(packageName, 0).versionName;
- } catch (final PackageManager.NameNotFoundException e) {
- return "unknown";
- }
- } else {
- return "unknown";
- }
- }
}