Fixed some bugs and improvements

Author: shuboooom

pingmelive/src/main/java/com/pingmelive/lib/DBHelper.java

@@ -3,6 +3,7 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
@@ -262,7 +263,7 @@ public static String getDatetime(String dateFormat,long milliSeconds) {
 
     public  String getMessage(String message)
     {
-        return "Version - "+getVersionName(context)+"("+ BuildConfig.VERSION_CODE+")\n"+message;
+        return "Version - "+getVersionName(context)+"( "+ getVersionCode(context)+" )\n"+message;
     }
 
     public String getDetailedText(String text)
@@ -295,4 +296,10 @@ private String getVersionCode(Context context) {
             return "Unknown Version Name";
         }
     }
+
+    public static String getApplicationName(Context context) {
+        ApplicationInfo applicationInfo = context.getApplicationInfo();
+        int stringId = applicationInfo.labelRes;
+        return stringId == 0 ? applicationInfo.nonLocalizedLabel.toString() : context.getString(stringId);
+    }
 }