empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Move classes into library

Browse source
This commit is contained in:
Moxie Marlinspike 2013-09-11 15:32:18 -07:00
parent 8f6590b738
commit 5e6d39beea
11 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/util/FutureTaskListener.java → library/src/org/whispersystems/textsecure/util/FutureTaskListener.java
View file

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.util;
package org.whispersystems.textsecure.util;
public interface FutureTaskListener<V> {
public void onSuccess(V result);

3
src/org/thoughtcrime/securesms/util/ListenableFutureTask.java → library/src/org/whispersystems/textsecure/util/ListenableFutureTask.java
View file

@ -1,6 +1,5 @@
package org.thoughtcrime.securesms.util;
package org.whispersystems.textsecure.util;
import java.lang.ref.WeakReference;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.FutureTask;

2
src/com/google/zxing/integration/android/IntentIntegrator.java → library/src/org/whispersystems/textsecure/zxing/integration/IntentIntegrator.java
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.zxing.integration.android;
package org.whispersystems.textsecure.zxing.integration;
import android.app.AlertDialog;
import android.app.Activity;

2
src/com/google/zxing/integration/android/IntentResult.java → library/src/org/whispersystems/textsecure/zxing/integration/IntentResult.java
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.zxing.integration.android;
package org.whispersystems.textsecure.zxing.integration;
/**
* <p>Encapsulates the result of a barcode scan invoked through {@link IntentIntegrator}.</p>

14
res/layout/conversation_list_activity.xml
View file

@ -19,12 +19,12 @@
android:dividerHeight="1dp"
android:background="?navigation_drawer_background"/>
<TextView android:id="@android:id/empty"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?conversation_text_secondary_color"
android:text="Empty message list" />
<!--<TextView android:id="@android:id/empty"-->
<!--android:layout_width="fill_parent"-->
<!--android:layout_height="fill_parent"-->
<!--android:gravity="center"-->
<!--android:textAppearance="?android:attr/textAppearanceLarge"-->
<!--android:textColor="?conversation_text_secondary_color"-->
<!--android:text="Empty message list" />-->
</android.support.v4.widget.DrawerLayout>

4
src/org/thoughtcrime/securesms/ConversationItem.java
View file

@ -53,8 +53,8 @@ import org.thoughtcrime.securesms.mms.SlideDeck;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.service.SendReceiveService;
import org.thoughtcrime.securesms.util.Emoji;
import org.thoughtcrime.securesms.util.FutureTaskListener;
import org.thoughtcrime.securesms.util.ListenableFutureTask;
import org.whispersystems.textsecure.util.FutureTaskListener;
import org.whispersystems.textsecure.util.ListenableFutureTask;
import java.io.File;
import java.io.FileOutputStream;

4
src/org/thoughtcrime/securesms/KeyScanningActivity.java
View file

@ -28,8 +28,8 @@ import org.thoughtcrime.securesms.util.DynamicTheme;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import org.whispersystems.textsecure.zxing.integration.IntentIntegrator;
import org.whispersystems.textsecure.zxing.integration.IntentResult;
/**
* Activity for initiating/receiving key QR code scans.

2
src/org/thoughtcrime/securesms/database/MmsDatabase.java
View file

@ -43,7 +43,7 @@ import org.thoughtcrime.securesms.recipients.RecipientFactory;
import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.thoughtcrime.securesms.util.LRUCache;
import org.thoughtcrime.securesms.util.ListenableFutureTask;
import org.whispersystems.textsecure.util.ListenableFutureTask;
import org.thoughtcrime.securesms.util.Trimmer;
import org.whispersystems.textsecure.util.Util;

3
src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
View file

@ -21,11 +21,10 @@ import android.text.SpannableString;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.database.MmsDatabase;
import org.thoughtcrime.securesms.mms.Slide;
import org.thoughtcrime.securesms.mms.SlideDeck;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.thoughtcrime.securesms.util.ListenableFutureTask;
import org.whispersystems.textsecure.util.ListenableFutureTask;
/**
* Represents the message record model for MMS messages that contain

4
src/org/thoughtcrime/securesms/recipients/Recipient.java
View file

@ -25,8 +25,8 @@ import android.util.Log;
import org.thoughtcrime.securesms.database.CanonicalAddressDatabase;
import org.thoughtcrime.securesms.recipients.RecipientProvider.RecipientDetails;
import org.thoughtcrime.securesms.util.FutureTaskListener;
import org.thoughtcrime.securesms.util.ListenableFutureTask;
import org.whispersystems.textsecure.util.FutureTaskListener;
import org.whispersystems.textsecure.util.ListenableFutureTask;
import org.whispersystems.textsecure.storage.CanonicalRecipientAddress;
import java.util.HashSet;

2
src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
View file

@ -28,7 +28,7 @@ import android.util.Log;
import org.thoughtcrime.securesms.contacts.ContactPhotoFactory;
import org.thoughtcrime.securesms.util.LRUCache;
import org.thoughtcrime.securesms.util.ListenableFutureTask;
import org.whispersystems.textsecure.util.ListenableFutureTask;
import org.thoughtcrime.securesms.util.Util;
import java.io.InputStream;