diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-12-02 23:02:10 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-12-02 23:02:10 +0100 |
commit | a0dcdf5c762ff28edeea34c2cfe654c31889abc7 (patch) | |
tree | 9e92fc9f9f0bc44c2593c00e29290ad8f392747e /src/main/java/eu/siacs/conversations/persistance | |
parent | 6bc277152a8e1bcf5347d3e1d60c93dfc904ca23 (diff) | |
parent | 9efc13983516c4c37540eb9544f8fa411ded81c7 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/persistance')
-rw-r--r-- | src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java | 8 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java index d11b02fa..c6701900 100644 --- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java @@ -18,7 +18,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteCantOpenDatabaseException; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; +import de.thedevstack.conversationsplus.utils.Logging; public class DatabaseBackend extends SQLiteOpenHelper { @@ -145,7 +145,7 @@ public class DatabaseBackend extends SQLiteOpenHelper { cursor.getString(cursor.getColumnIndex(Conversation.CONTACTJID)) ).toString(); } catch (InvalidJidException ignored) { - Log.e(Config.LOGTAG, "Failed to migrate Conversation CONTACTJID " + Logging.e(Config.LOGTAG, "Failed to migrate Conversation CONTACTJID " +cursor.getString(cursor.getColumnIndex(Conversation.CONTACTJID)) +": " + ignored +". Skipping..."); continue; @@ -170,7 +170,7 @@ public class DatabaseBackend extends SQLiteOpenHelper { cursor.getString(cursor.getColumnIndex(Contact.JID)) ).toString(); } catch (InvalidJidException ignored) { - Log.e(Config.LOGTAG, "Failed to migrate Contact JID " + Logging.e(Config.LOGTAG, "Failed to migrate Contact JID " +cursor.getString(cursor.getColumnIndex(Contact.JID)) +": " + ignored +". Skipping..."); continue; @@ -199,7 +199,7 @@ public class DatabaseBackend extends SQLiteOpenHelper { "mobile" ).getDomainpart(); } catch (InvalidJidException ignored) { - Log.e(Config.LOGTAG, "Failed to migrate Account SERVER " + Logging.e(Config.LOGTAG, "Failed to migrate Account SERVER " +cursor.getString(cursor.getColumnIndex(Account.SERVER)) +": " + ignored +". Skipping..."); continue; diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java index a90e14e6..301140e9 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java @@ -16,7 +16,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.Uri; import android.os.Environment; -import android.util.Log; +import de.thedevstack.conversationsplus.utils.Logging; import android.webkit.MimeTypeMap; import de.thedevstack.conversationsplus.ConversationsPlusApplication; @@ -83,7 +83,7 @@ public final class FileBackend { } public static DownloadableFile copyFileToPrivateStorage(Message message, Uri uri) throws FileCopyException { - Log.d(Config.LOGTAG, "copy " + uri.toString() + " to private storage"); + Logging.d(Config.LOGTAG, "copy " + uri.toString() + " to private storage"); String mime = ConversationsPlusApplication.getInstance().getContentResolver().getType(uri); String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime); message.setRelativeFilePath(message.getUuid() + "." + extension); @@ -110,7 +110,7 @@ public final class FileBackend { StreamUtil.close(os); StreamUtil.close(is); } - Log.d(Config.LOGTAG, "output file name " + file); + Logging.d(Config.LOGTAG, "output file name " + file); return file; } @@ -133,7 +133,7 @@ public final class FileBackend { Bitmap originalBitmap; BitmapFactory.Options options = new BitmapFactory.Options(); int inSampleSize = (int) Math.pow(2, sampleSize); - Log.d(Config.LOGTAG, "reading bitmap with sample size " + inSampleSize); + Logging.d(Config.LOGTAG, "reading bitmap with sample size " + inSampleSize); options.inSampleSize = inSampleSize; originalBitmap = BitmapFactory.decodeStream(is, null, options); is.close(); |