thedevstack/conversations-plus
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved logcat to a module, increased error robustness for loading last messages

Browse source
This commit is contained in:
steckbrief 2015-12-10 20:01:50 +01:00
parent eb5a7a5392
commit a745422300
47 changed files with 237 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -9,14 +9,18 @@ Of course Conversations+ supports [all features of Conversations](https://github
* smileys like Whatsapp
* change of LED notification color
* online status in contact and conversation list
* Manual loading of last messages from MAM
* Sending of original images
## Modifications
* unread count badges take care of setting "Conference notifications"
* swipe to end conversation only in one direction
* replace ASCII-smileys
* Swipe to refresh for loading archived messages using MAM
* settings
* confirmation for received and/or read messages
* automatically download picture links
* automatically download only when wifi enabled
* bugfixes and code improvements
* sending original or resized images
* bugfixes and code improvements

1
build.gradle
View file

@ -39,6 +39,7 @@ dependencies {
compile project(':libs:emojicon')
compile project(':libs:colorpicker')
compile project(':libs:SwipyRefreshLayout')
compile project(':libs:thedevstacklogcat')
}
android {

2
libs/SwipyRefreshLayout/build.gradle
View file

@ -20,5 +20,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:22.0.+'
compile 'com.android.support:appcompat-v7:22.2.1'
}

1
libs/thedevstacklogcat/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/build

25
libs/thedevstacklogcat/build.gradle Normal file
View file

@ -0,0 +1,25 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
defaultConfig {
minSdkVersion 14
targetSdkVersion 22
versionCode 1
versionName "1.0"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:22.2.1'
}

17
libs/thedevstacklogcat/proguard-rules.pro vendored Normal file
View file

@ -0,0 +1,17 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in C:\Users\tzur\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

13
libs/thedevstacklogcat/src/androidTest/java/de/thedevstack/android/logcat/ApplicationTest.java Normal file
View file

@ -0,0 +1,13 @@
package de.thedevstack.android.logcat;
import android.app.Application;
import android.test.ApplicationTestCase;
/**
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
*/
public class ApplicationTest extends ApplicationTestCase<Application> {
public ApplicationTest() {
super(Application.class);
}
}

4
libs/thedevstacklogcat/src/main/AndroidManifest.xml Normal file
View file

@ -0,0 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.thedevstack.android.logcat">
</manifest>

30
src/main/java/de/thedevstack/conversationsplus/utils/Logging.java → libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/Logging.java
View file

@ -1,12 +1,36 @@
package de.thedevstack.conversationsplus.utils;
package de.thedevstack.android.logcat;
import android.util.Log;
/**
* Created by tzur on 20.11.2015.
* Utility class to prefix every log tag.
* This can be used for better filtering in the log cat output activity.
*/
public class Logging {
protected static final String LOG_TAG_PREFIX = "thedevstack.";
/**
* The prefix for every log tag.
*/
protected static String LOG_TAG_PREFIX = "thedevstack.";
/**
* Changes the default log tag prefix.
* The default value is <code>thedevstack.</code>
* @param logTagPrefix the new log tag prefix to use
*/
public static void initLogTagPrefix(String logTagPrefix) {
if (null != logTagPrefix) {
LOG_TAG_PREFIX = logTagPrefix;
}
}
/**
* Returns the current log tag prefix.
* @return value of Logging.LOG_TAG_PREFIX
*/
public static String getLogTagPrefix() {
return LOG_TAG_PREFIX;
}
/**
* Send a {@link Log#VERBOSE} log message.
* @param tag Used to identify the source of a log message. It usually identifies

0
src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java → libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java
View file

52
src/main/java/de/thedevstack/android/logcat/tasks/ReadLogCatAsyncTask.java → libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/tasks/ReadLogCatAsyncTask.java
View file

@ -1,7 +1,6 @@
package de.thedevstack.android.logcat.tasks;
import android.os.AsyncTask;
import de.thedevstack.conversationsplus.utils.Logging;
import android.widget.ArrayAdapter;
import java.io.BufferedReader;
@ -9,20 +8,46 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import de.thedevstack.conversationsplus.utils.StreamUtil;
import de.thedevstack.android.logcat.Logging;
/**
* Created by tzur on 20.11.2015.
* Task to read the logcat of the App.
* The command <code>logcat -d -v time</code> is used to load the logs.
* This reader uses a white list to restrict the messages to display, otherwise it might be flooded with useless log messages.
* The white list checks if a log messages contains one of the following strings:
* <ul>
* <li>{@value Logging#LOG_TAG_PREFIX}</li>
* <li><code>E/</code> - for every error message</li>
* <li><code>W/</code> - for every warning message</li>
* </ul>
*/
public class ReadLogCatAsyncTask extends AsyncTask<Void, Void, String[]> {
/**
* The array adapter to publish the log messages to.
*/
private final ArrayAdapter<String> arrayAdapter;
/**
* The command to execute logcat.
*/
private static final String[] LOG_CAT_CMD = { "logcat", "-d", "-v", "time"};
private static final String[] WHITE_LIST = { "thedevstack.", "E/", "W/" };
private static final String[] BLACK_LIST = { "D/TextLayoutCache" };
/**
* The white list to filter log messages.
*/
private static final String[] WHITE_LIST = { Logging.getLogTagPrefix(), "E/", "W/" };
/**
* Initializes the Task with the array adapter to publish the log messages to.
* @param arrayAdapter the array adapter
*/
public ReadLogCatAsyncTask(ArrayAdapter<String> arrayAdapter) {
this.arrayAdapter = arrayAdapter;
}
/**
* Executes the logcat command, reads the output of the command and returns all log messages.
* @param params no params will be passed. (interface compliance)
* @return the array of log messages
*/
@Override
protected String[] doInBackground(Void... params) {
ArrayList<String> logCatOutput = new ArrayList<>();
@ -34,16 +59,24 @@ public class ReadLogCatAsyncTask extends AsyncTask<Void, Void, String[]> {
while ((line = bufferedReader.readLine()) != null) {
logCatOutput.add(line);
}
bufferedReader.close();
} catch (IOException e) {
Logging.e("ReadLogCat", "error while retrieving information from logcat: " + e.getMessage(), e);
} finally {
StreamUtil.close(bufferedReader);
if (null != bufferedReader) {
try {
bufferedReader.close();
} catch (IOException e) {
}
}
}
logCatOutput.trimToSize();
return logCatOutput.toArray(new String[0]);
}
/**
* Clears the array adapter and adds the filtered log messages.
* @param items all log messages
*/
@Override
protected void onPostExecute(String[] items) {
this.arrayAdapter.clear();
@ -56,6 +89,11 @@ public class ReadLogCatAsyncTask extends AsyncTask<Void, Void, String[]> {
}
}
/**
* Checks whether a log message contains a white listed string or not.
* @param item the item to filter
* @return <code>true</code> if the string should be filtered (removed from the list) <code>false</code> otherwise.
*/
protected boolean filter(String item) {
for (String whiteListed : ReadLogCatAsyncTask.WHITE_LIST) {
if (item.contains(whiteListed)) {

10
src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java → libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java
View file

@ -9,8 +9,6 @@ import android.widget.Toast;
import java.util.ArrayList;
import de.thedevstack.android.logcat.adapters.LogCatArrayAdapter;
import de.thedevstack.conversationsplus.ConversationsPlusApplication;
import de.thedevstack.conversationsplus.R;
/**
* Created by tzur on 20.11.2015.
@ -18,10 +16,12 @@ import de.thedevstack.conversationsplus.R;
public class LogCatOutputCopyOnClickListener implements View.OnClickListener {
private final LogCatArrayAdapter logCatOutputAdapter;
private final Context context;
private final int resIdForToast;
public LogCatOutputCopyOnClickListener(Context context, LogCatArrayAdapter logCatOutputAdapter) {
public LogCatOutputCopyOnClickListener(Context context, LogCatArrayAdapter logCatOutputAdapter, int resIdForToast) {
this.logCatOutputAdapter = logCatOutputAdapter;
this.context = context;
this.resIdForToast = resIdForToast;
}
@Override
@ -33,10 +33,10 @@ public class LogCatOutputCopyOnClickListener implements View.OnClickListener {
sb.append(item);
sb.append("\n");
}
ClipboardManager clipboard = (ClipboardManager) ConversationsPlusApplication.getInstance().getSystemService(Context.CLIPBOARD_SERVICE);
ClipboardManager clipboard = (ClipboardManager) this.context.getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText("c+logcat", sb.toString());
clipboard.setPrimaryClip(clip);
Toast.makeText(this.context, R.string.cplus_copied_to_clipboard, Toast.LENGTH_LONG).show();
Toast.makeText(this.context, this.context.getText(this.resIdForToast), Toast.LENGTH_LONG).show();
}
}
}

3
libs/thedevstacklogcat/src/main/res/values/strings.xml Normal file
View file

@ -0,0 +1,3 @@
<resources>
<string name="thedevstack_logcat_copy">Copy</string>
</resources>

15
libs/thedevstacklogcat/src/test/java/de/thedevstack/android/logcat/ExampleUnitTest.java Normal file
View file

@ -0,0 +1,15 @@
package de.thedevstack.android.logcat;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* To work on unit tests, switch the Test Artifact in the Build Variants view.
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() throws Exception {
assertEquals(4, 2 + 2);
}
}

2
settings.gradle
View file

@ -1,4 +1,4 @@
include ':libs:MemorizingTrustManager', ':libs:emojicon', ':libs:colorpicker', ':libs:SwipyRefreshLayout'
include ':libs:MemorizingTrustManager', ':libs:emojicon', ':libs:colorpicker', ':libs:SwipyRefreshLayout', ':libs:thedevstacklogcat'
include ':libs:openpgp-api-lib'
rootProject.name = 'Conversations'

2
src/main/AndroidManifest.xml
View file

@ -145,7 +145,7 @@
android:value="de.thedevstack.conversationsplus.ui.SettingsActivity" />
</activity>
<activity
android:name="de.thedevstack.android.logcat.ui.LogCatOutputActivity"
android:name="de.thedevstack.conversationsplus.ui.LogCatOutputActivity"
android:label="@string/title_activity_loginformation"
android:parentActivityName="de.thedevstack.conversationsplus.ui.SettingsActivity" >
<meta-data

2
src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java
View file

@ -14,7 +14,7 @@ import java.security.spec.InvalidKeySpecException;
import org.json.JSONException;
import org.json.JSONObject;
import de.thedevstack.conversationsplus.utils.Logging;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.ConversationsPlusPreferences;

3
src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java
View file

@ -19,11 +19,10 @@ import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.utils.MimeUtils;
import de.thedevstack.conversationsplus.utils.Logging;
public class DownloadableFile extends File {
private static final long serialVersionUID = 2247012619505115863L;

2
src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
View file

@ -3,7 +3,6 @@ package de.thedevstack.conversationsplus.http;
import android.content.Intent;
import android.net.Uri;
import android.os.SystemClock;
import de.thedevstack.conversationsplus.utils.Logging;
import java.io.BufferedInputStream;
import java.io.IOException;
@ -16,6 +15,7 @@ import java.util.Arrays;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLHandshakeException;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
import de.thedevstack.conversationsplus.R;

2
src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
View file

@ -1,7 +1,6 @@
package de.thedevstack.conversationsplus.http;
import android.app.PendingIntent;
import de.thedevstack.conversationsplus.utils.Logging;
import java.io.IOException;
import java.io.InputStream;
@ -12,6 +11,7 @@ import java.net.URL;
import javax.net.ssl.HttpsURLConnection;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.entities.Account;
import de.thedevstack.conversationsplus.entities.Transferable;

3
src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
View file

@ -1,10 +1,9 @@
package de.thedevstack.conversationsplus.parser;
import de.thedevstack.conversationsplus.utils.Logging;
import java.util.ArrayList;
import java.util.Collection;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.entities.Account;
import de.thedevstack.conversationsplus.entities.Contact;

2
src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
View file

@ -1,11 +1,11 @@
package de.thedevstack.conversationsplus.parser;
import de.thedevstack.conversationsplus.utils.Logging;
import android.util.Pair;
import net.java.otr4j.session.Session;
import net.java.otr4j.session.SessionStatus;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.entities.Account;

2
src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java
View file

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.entities.Account;
import de.thedevstack.conversationsplus.entities.Contact;
@ -18,7 +19,6 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteCantOpenDatabaseException;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import de.thedevstack.conversationsplus.utils.Logging;
public class DatabaseBackend extends SQLiteOpenHelper {

2
src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
View file

@ -16,9 +16,9 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Environment;
import de.thedevstack.conversationsplus.utils.Logging;
import android.webkit.MimeTypeMap;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.ConversationsPlusApplication;
import de.thedevstack.conversationsplus.R;

3
src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java
View file

@ -1,13 +1,12 @@
package de.thedevstack.conversationsplus.services;
import de.thedevstack.conversationsplus.utils.Logging;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.R;
import de.thedevstack.conversationsplus.entities.Account;

3
src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
View file

@ -21,7 +21,6 @@ import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
import android.os.SystemClock;
import android.provider.ContactsContract;
import de.thedevstack.conversationsplus.utils.Logging;
import net.java.otr4j.OtrException;
import net.java.otr4j.session.Session;
@ -50,6 +49,8 @@ import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import de.duenndns.ssl.MemorizingTrustManager;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.ConversationsPlusApplication;
import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
import de.thedevstack.conversationsplus.exceptions.FileCopyException;

5
src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputActivity.java → src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
View file

@ -1,4 +1,4 @@
package de.thedevstack.android.logcat.ui;
package de.thedevstack.conversationsplus.ui;
import android.app.Activity;
import android.os.Bundle;
@ -7,6 +7,7 @@ import android.widget.ListView;
import de.thedevstack.android.logcat.adapters.LogCatArrayAdapter;
import de.thedevstack.android.logcat.tasks.ReadLogCatAsyncTask;
import de.thedevstack.android.logcat.ui.LogCatOutputCopyOnClickListener;
import de.thedevstack.conversationsplus.R;
/**
@ -22,6 +23,6 @@ public class LogCatOutputActivity extends Activity {
lv.setAdapter(logCatOutputAdapter);
new ReadLogCatAsyncTask(logCatOutputAdapter).execute();
Button copyButton = (Button) findViewById(R.id.actLogOutputCopyButton);
copyButton.setOnClickListener(new LogCatOutputCopyOnClickListener(this, logCatOutputAdapter));
copyButton.setOnClickListener(new LogCatOutputCopyOnClickListener(this, logCatOutputAdapter, R.string.cplus_copied_to_clipboard));
}
}

2
src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
View file

@ -24,7 +24,6 @@ import android.support.v13.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
import android.text.Editable;
import android.text.TextWatcher;
import de.thedevstack.conversationsplus.utils.Logging;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.KeyEvent;
@ -52,6 +51,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
import de.thedevstack.conversationsplus.R;

2
src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
View file

@ -37,7 +37,6 @@ import android.os.IBinder;
import android.os.SystemClock;
import android.text.InputType;
import android.util.DisplayMetrics;
import de.thedevstack.conversationsplus.utils.Logging;
import android.view.MenuItem;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
@ -62,6 +61,7 @@ import java.util.Hashtable;
import java.util.List;
import java.util.concurrent.RejectedExecutionException;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
import de.thedevstack.conversationsplus.R;

2
src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
View file

@ -8,7 +8,6 @@ import android.graphics.Typeface;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import de.thedevstack.conversationsplus.utils.Logging;
import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
@ -21,6 +20,7 @@ import java.lang.ref.WeakReference;
import java.util.List;
import java.util.concurrent.RejectedExecutionException;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener;
import de.tzur.conversations.Settings;

2
src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
View file

@ -2,12 +2,12 @@ package de.thedevstack.conversationsplus.ui.dialogs;
import android.app.Activity;
import android.text.format.DateFormat;
import de.thedevstack.conversationsplus.utils.Logging;
import android.view.View;
import android.widget.TextView;
import java.util.Date;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.R;
import de.thedevstack.conversationsplus.entities.Conversation;
import de.thedevstack.conversationsplus.entities.Message;

48
src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java
View file

@ -1,8 +1,5 @@
package de.thedevstack.conversationsplus.ui.listeners;
import de.thedevstack.conversationsplus.R;
import de.thedevstack.conversationsplus.services.MessageArchiveService;
import de.thedevstack.conversationsplus.utils.Logging;
import android.widget.ListView;
import com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayout;
@ -10,6 +7,10 @@ import com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayoutD
import java.util.List;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.R;
import de.thedevstack.conversationsplus.entities.Conversation;
import de.thedevstack.conversationsplus.services.MessageArchiveService;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.entities.Message;
import de.thedevstack.conversationsplus.ui.ConversationActivity;
@ -36,7 +37,7 @@ public class ConversationSwipeRefreshListener implements SwipyRefreshLayout.OnRe
Logging.d(Config.LOGTAG, "Refresh direction " + direction);
synchronized (this.messageList) {
long timestamp;
if (SwipyRefreshLayoutDirection.TOP == direction) {
if (SwipyRefreshLayoutDirection.TOP == direction) { // Load history -> messages sent/received before first message in database
if (messageList.isEmpty()) {
timestamp = System.currentTimeMillis();
} else {
@ -45,28 +46,47 @@ public class ConversationSwipeRefreshListener implements SwipyRefreshLayout.OnRe
ConversationActivity activity = (ConversationActivity) fragment.getActivity();
this.listener.setLoadHistory(true);
activity.xmppConnectionService.loadMoreMessages(activity.getSelectedConversation(), timestamp, this.listener);
} else if (SwipyRefreshLayoutDirection.BOTTOM == direction) {
} else if (SwipyRefreshLayoutDirection.BOTTOM == direction) { // load messages sent/received between last received or last session establishment and now
Logging.d("mam", "loading missing messages from mam (last session establishing or last received message)");
final ConversationActivity activity = (ConversationActivity) fragment.getActivity();
long lastSessionEstablished = activity.getSelectedConversation().getAccount().getXmppConnection().getLastSessionEstablished();
int lastMessageIndex = this.messageList.size() - 1;
long lastReceivedMessage = (0 <= lastMessageIndex) ? this.messageList.get(lastMessageIndex).getTimeSent() : Long.MAX_VALUE;
long lastSessionEstablished = this.getTimestampOfLastSessionEstablished(activity.getSelectedConversation());
long lastReceivedMessage = this.getTimestampOfLastReceivedOrTransmittedMessage();
long startTimestamp = Math.min(lastSessionEstablished, lastReceivedMessage);
MessageArchiveService.Query query = activity.xmppConnectionService.getMessageArchiveService().query(activity.getSelectedConversation(), startTimestamp, System.currentTimeMillis());
if (query != null) {
this.listener.setLoadHistory(false);
query.setCallback(this.listener);
} else {
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
listener.onMoreMessagesLoaded(0, activity.getSelectedConversation());
}
});
Logging.d("mam", "no query built - no messages loaded");
this.listener.onMoreMessagesLoaded(0, activity.getSelectedConversation());
this.listener.informUser(R.string.no_more_history_on_server);
}
this.listener.informUser(R.string.fetching_history_from_server);
}
}
Logging.d(Config.LOGTAG, "End Refresh swipe container");
}
private long getTimestampOfLastReceivedOrTransmittedMessage() {
long lastReceivedOrTransmittedMessage = Long.MAX_VALUE;
if (null != this.messageList
&& !this.messageList.isEmpty()) {
int lastMessageIndex = this.messageList.size() - 1;
if (0 <= lastMessageIndex && this.messageList.size() > lastMessageIndex) {
lastReceivedOrTransmittedMessage = this.messageList.get(lastMessageIndex).getTimeSent();
}
}
return lastReceivedOrTransmittedMessage;
}
private long getTimestampOfLastSessionEstablished(Conversation conversation) {
long lastSessionEstablished = Long.MAX_VALUE;
if (null != conversation
&& null != conversation.getAccount()
&& null != conversation.getAccount().getXmppConnection()) {
lastSessionEstablished = conversation.getAccount().getXmppConnection().getLastSessionEstablished();
}
return lastSessionEstablished;
}
}

2
src/main/java/de/thedevstack/conversationsplus/ui/preferences/LogInformationPreference.java
View file

@ -5,7 +5,7 @@ import android.content.Intent;
import android.preference.Preference;
import android.util.AttributeSet;
import de.thedevstack.android.logcat.ui.LogCatOutputActivity;
import de.thedevstack.conversationsplus.ui.LogCatOutputActivity;
/**
* Created by tzur on 07.10.2015.

2
src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
View file

@ -4,7 +4,6 @@ import android.graphics.Bitmap;
import android.net.Uri;
import android.util.Base64;
import android.util.Base64OutputStream;
import de.thedevstack.conversationsplus.utils.Logging;
import java.io.ByteArrayOutputStream;
import java.io.File;
@ -16,6 +15,7 @@ import java.security.DigestOutputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.ConversationsPlusApplication;
import de.thedevstack.conversationsplus.xmpp.pep.Avatar;

7
src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java
View file

@ -10,8 +10,6 @@ import de.measite.minidns.record.A;
import de.measite.minidns.record.AAAA;
import de.measite.minidns.record.Data;
import de.measite.minidns.util.NameUtil;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.xmpp.jid.Jid;
import java.io.IOException;
import java.net.InetAddress;
@ -23,7 +21,10 @@ import java.util.TreeMap;
import java.util.regex.Pattern;
import android.os.Bundle;
import de.thedevstack.conversationsplus.utils.Logging;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.xmpp.jid.Jid;
public class DNSHelper {

2
src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java
View file

@ -6,6 +6,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.util.List;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
import de.thedevstack.conversationsplus.R;
@ -26,7 +27,6 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.preference.PreferenceManager;
import android.text.format.DateUtils;
import de.thedevstack.conversationsplus.utils.Logging;
public class ExceptionHelper {
public static void init(Context context) {

2
src/main/java/de/thedevstack/conversationsplus/utils/ExifHelper.java
View file

@ -16,7 +16,7 @@
package de.thedevstack.conversationsplus.utils;
import de.thedevstack.conversationsplus.utils.Logging;
import de.thedevstack.android.logcat.Logging;
import java.io.IOException;
import java.io.InputStream;

2
src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java
View file

@ -7,7 +7,6 @@ import android.graphics.Matrix;
import android.graphics.RectF;
import android.media.ExifInterface;
import android.net.Uri;
import de.thedevstack.conversationsplus.utils.Logging;
import android.util.LruCache;
import java.io.File;
@ -15,6 +14,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.entities.Message;
import de.thedevstack.conversationsplus.persistance.FileBackend;

3
src/main/java/de/thedevstack/conversationsplus/utils/PRNGFixes.java
View file

@ -2,7 +2,6 @@ package de.thedevstack.conversationsplus.utils;
import android.os.Build;
import android.os.Process;
import de.thedevstack.conversationsplus.utils.Logging;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
@ -19,6 +18,8 @@ import java.security.SecureRandom;
import java.security.SecureRandomSpi;
import java.security.Security;
import de.thedevstack.android.logcat.Logging;
/**
* Fixes for the output of the default PRNG having low entropy.
*

3
src/main/java/de/thedevstack/conversationsplus/xml/Element.java
View file

@ -1,11 +1,10 @@
package de.thedevstack.conversationsplus.xml;
import de.thedevstack.conversationsplus.utils.Logging;
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.utils.XmlHelper;
import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;

2
src/main/java/de/thedevstack/conversationsplus/xml/XmlReader.java
View file

@ -7,11 +7,11 @@ import java.io.InputStreamReader;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
import de.thedevstack.conversationsplus.utils.Logging;
import android.util.Xml;
public class XmlReader {

2
src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java
View file

@ -6,7 +6,6 @@ import android.os.Parcelable;
import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
import android.os.SystemClock;
import de.thedevstack.conversationsplus.utils.Logging;
import android.util.Pair;
import android.util.SparseArray;
@ -43,6 +42,7 @@ import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.X509TrustManager;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.crypto.sasl.DigestMd5;
import de.thedevstack.conversationsplus.crypto.sasl.Plain;

3
src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
View file

@ -11,7 +11,8 @@ import java.util.concurrent.ConcurrentHashMap;
import android.content.Intent;
import android.net.Uri;
import android.os.SystemClock;
import de.thedevstack.conversationsplus.utils.Logging;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
import de.thedevstack.conversationsplus.entities.Account;

3
src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
View file

@ -6,7 +6,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import android.annotation.SuppressLint;
import de.thedevstack.conversationsplus.utils.Logging;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.entities.Account;
import de.thedevstack.conversationsplus.entities.Transferable;

2
src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java
View file

@ -8,8 +8,8 @@ import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import android.util.Base64;
import de.thedevstack.conversationsplus.utils.Logging;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.entities.Account;
import de.thedevstack.conversationsplus.entities.DownloadableFile;

3
src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java
View file

@ -1,7 +1,5 @@
package de.thedevstack.conversationsplus.xmpp.jingle;
import de.thedevstack.conversationsplus.utils.Logging;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@ -14,6 +12,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.Config;
import de.thedevstack.conversationsplus.entities.DownloadableFile;
import de.thedevstack.conversationsplus.persistance.FileBackend;

2
src/main/java/de/tzur/conversations/Settings.java
View file

@ -1,8 +1,8 @@
package de.tzur.conversations;
import android.content.SharedPreferences;
import de.thedevstack.conversationsplus.utils.Logging;
import de.thedevstack.android.logcat.Logging;
import de.thedevstack.conversationsplus.ConversationsPlusApplication;
/**