TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-22 14:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lint warning changes.

Browse Source
This commit is contained in:
Moxie Marlinspike 2012-09-09 16:10:46 -07:00
parent d102bd015e
commit 3d3db421d3
13 changed files with 346 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
AndroidManifest.xml
View File

@ -6,6 +6,28 @@
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14"/> <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14"/>
<permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
android:label="Access to TextSecure Secrets"
android:protectionLevel="signature" />
<uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"></uses-permission>
<uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"></uses-permission>
<uses-permission android:name="android.permission.READ_CONTACTS"></uses-permission>
<uses-permission android:name="android.permission.WRITE_CONTACTS"></uses-permission>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.RECEIVE_SMS"></uses-permission>
<uses-permission android:name="android.permission.RECEIVE_MMS"></uses-permission>
<uses-permission android:name="android.permission.READ_SMS"></uses-permission>
<uses-permission android:name="android.permission.SEND_SMS"></uses-permission>
<uses-permission android:name="android.permission.WRITE_SMS"></uses-permission>
<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application android:icon="@drawable/icon" <application android:icon="@drawable/icon"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/Theme.Sherlock.Light.DarkActionBar"> android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
@ -131,34 +153,12 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<provider android:name=".providers.PartProvider" android:authorities="org.thoughtcrime.provider.securesms" /> <provider android:name=".providers.PartProvider"
android:authorities="org.thoughtcrime.provider.securesms" />
<uses-library android:name="android.test.runner" /> <uses-library android:name="android.test.runner" />
</application> </application>
<permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
android:label="Access to TextSecure Secrets"
android:protectionLevel="signature" />
<uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"></uses-permission>
<uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"></uses-permission>
<uses-permission android:name="android.permission.READ_CONTACTS"></uses-permission>
<uses-permission android:name="android.permission.WRITE_CONTACTS"></uses-permission>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.RECEIVE_SMS"></uses-permission>
<uses-permission android:name="android.permission.RECEIVE_MMS"></uses-permission>
<uses-permission android:name="android.permission.READ_SMS"></uses-permission>
<uses-permission android:name="android.permission.SEND_SMS"></uses-permission>
<uses-permission android:name="android.permission.WRITE_SMS"></uses-permission>
<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<instrumentation android:name="android.test.InstrumentationTestRunner" <instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="org.thoughtcrime.securesms.tests" android:label="Tests for My App" /> android:targetPackage="org.thoughtcrime.securesms.tests" android:label="Tests for My App" />

115
res/layout/change_passphrase_activity.xml
View File

@ -1,63 +1,90 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="fill_parent">
<TableLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent" >
android:stretchColumns="1">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:orientation="vertical" >
<TableRow>
<TextView <TextView
android:textSize="12sp" android:padding="3dip"
android:text="@string/old_passphrase" android:text="@string/old_passphrase"
android:padding="3dip" /> android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
<EditText android:id="@+id/old_passphrase" <EditText
android:layout_height="wrap_content" android:id="@+id/old_passphrase"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:password="true"/> android:layout_height="wrap_content"
</TableRow> android:inputType="textPassword"
android:layout_marginBottom="5dip" />
<TableRow>
<TextView <TextView
android:padding="3dip"
android:text="@string/new_passphrase" android:text="@string/new_passphrase"
android:textSize="12sp" android:layout_width="fill_parent"
android:padding="3dip" /> android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText android:id="@+id/new_passphrase" <EditText
android:layout_height="wrap_content" android:id="@+id/new_passphrase"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:password="true" android:layout_height="wrap_content"
/> android:inputType="textPassword"
</TableRow> android:layout_marginBottom="5dip" />
<TableRow>
<TextView <TextView
android:padding="3dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/repeat_new_passphrase" android:text="@string/repeat_new_passphrase"
android:textSize="12sp" android:textAppearance="?android:attr/textAppearanceMedium" />
android:padding="3dip" />
<EditText android:id="@+id/repeat_passphrase" <EditText
android:layout_height="wrap_content" android:id="@+id/repeat_passphrase"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:password="true" android:layout_height="wrap_content"
/> android:inputType="textPassword"
</TableRow> android:layout_marginBottom="5dip" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dip"
android:gravity="right"
android:orientation="horizontal" >
<TableRow> <TableLayout
<Button android:id="@+id/cancel_button" android:layout_width="wrap_content"
android:padding="10dip" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:stretchColumns="*"
android:layout_height="wrap_content" tools:ignore="UselessParent" >
android:text="@string/cancel"/>
<TableRow>
<Button
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
android:layout_marginRight="15dip"
android:text="@string/cancel" />
<Button
android:id="@+id/ok_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="16dip"
android:text="@android:string/ok" />
</TableRow>
</TableLayout>
</LinearLayout>
</LinearLayout>
<Button android:id="@+id/ok_button"
android:padding="10dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@android:string/ok"/>
</TableRow>
</TableLayout>
</ScrollView> </ScrollView>

2
res/layout/conversation_activity.xml
View File

@ -35,7 +35,7 @@
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="5dip" android:paddingBottom="5dip"
android:background="#fff"> android:background="#fff">

1
res/layout/conversation_fragment_cab.xml
View File

@ -12,7 +12,6 @@
android:maxLines="1" android:maxLines="1"
android:singleLine="true" android:singleLine="true"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceMediumInverse" android:textAppearance="?android:attr/textAppearanceMediumInverse"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="wrap_content" android:layout_width="wrap_content"

4
res/layout/create_passphrase_activity.xml
View File

@ -28,7 +28,7 @@
<EditText android:id="@+id/passphrase_edit" <EditText android:id="@+id/passphrase_edit"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:password="true"/> android:inputType="textPassword"/>
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -42,7 +42,7 @@
<EditText <EditText
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:password="true" android:inputType="textPassword"
android:id="@+id/passphrase_edit_repeat"/> android:id="@+id/passphrase_edit_repeat"/>
<LinearLayout android:layout_width="fill_parent" <LinearLayout android:layout_width="fill_parent"

80
res/layout/save_identity_activity.xml
View File

@ -1,46 +1,58 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:orientation="vertical"> android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView android:layout_width="fill_parent" <TextView
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:layout_marginLeft="16dip" android:layout_height="wrap_content"
android:layout_marginRight="16dip" android:layout_marginBottom="5dip"
android:layout_marginTop="5dip" android:layout_marginLeft="16dip"
android:layout_marginBottom="5dip" android:layout_marginRight="16dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginTop="5dip"
android:text="@string/identity_name" /> android:text="@string/identity_name"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText android:layout_height="wrap_content" <EditText
android:layout_width="fill_parent" android:id="@+id/identity_name"
android:id="@+id/identity_name" android:layout_width="fill_parent"
android:layout_margin="16dip"/> android:layout_height="wrap_content"
android:layout_margin="16dip"
tools:ignore="TextFields" />
<LinearLayout android:layout_width="fill_parent" <LinearLayout
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:orientation="horizontal" android:layout_height="wrap_content"
android:layout_marginBottom="16dip" android:layout_marginBottom="16dip"
android:gravity="right"> android:gravity="right"
android:orientation="horizontal" >
<TableLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:stretchColumns="*"
tools:ignore="UselessParent" >
<TableLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:stretchColumns="*">
<TableRow> <TableRow>
<Button android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/cancel"
android:id="@+id/cancel_button"
android:layout_marginRight="15dip"
android:layout_marginLeft="16dip"/>
<Button android:layout_width="wrap_content" <Button
android:layout_height="wrap_content" android:id="@+id/cancel_button"
android:text="@android:string/ok" android:layout_width="wrap_content"
android:id="@+id/ok_button" android:layout_height="wrap_content"
android:layout_marginRight="16dip"/> android:layout_marginLeft="16dip"
android:layout_marginRight="15dip"
android:text="@string/cancel" />
<Button
android:id="@+id/ok_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="16dip"
android:text="@android:string/ok" />
</TableRow> </TableRow>
</TableLayout> </TableLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

2
res/layout/verify_imported_identity_activity.xml
View File

@ -4,7 +4,7 @@
android:layout_height="fill_parent"> android:layout_height="fill_parent">
<TableLayout <TableLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:shrinkColumns="1"> android:shrinkColumns="1">
<TableRow> <TableRow>

2
res/layout/view_identity_activity.xml
View File

@ -6,7 +6,7 @@
android:layout_marginRight="16dip"> android:layout_marginRight="16dip">
<TableLayout <TableLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:shrinkColumns="1"> android:shrinkColumns="1">
<TableRow> <TableRow>

2
src/org/thoughtcrime/securesms/contacts/ContactAccessorNewApi.java
View File

@ -185,7 +185,7 @@ public class ContactAccessorNewApi extends ContactAccessor {
return rawContactIds; return rawContactIds;
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
rawContactIds.add(new Long(cursor.getLong(0))); rawContactIds.add(Long.valueOf(cursor.getLong(0)));
} }
} finally { } finally {
if (cursor != null) if (cursor != null)

2
src/org/thoughtcrime/securesms/database/CanonicalAddressDatabase.java
View File

@ -119,7 +119,7 @@ public class CanonicalAddressDatabase {
private long getCanonicalAddressFromCache(String address) { private long getCanonicalAddressFromCache(String address) {
if (addressCache.containsKey(address)) if (addressCache.containsKey(address))
return new Long(addressCache.get(address)); return Long.valueOf(addressCache.get(address));
return -1L; return -1L;
} }

16
src/org/thoughtcrime/securesms/database/SmsDatabase.java
View File

@ -16,13 +16,6 @@
*/ */
package org.thoughtcrime.securesms.database; package org.thoughtcrime.securesms.database;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.Recipients;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
@ -32,6 +25,13 @@ import android.database.sqlite.SQLiteStatement;
import android.telephony.SmsMessage; import android.telephony.SmsMessage;
import android.util.Log; import android.util.Log;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.Recipients;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
/** /**
* Database for storage of SMS messages. * Database for storage of SMS messages.
* *
@ -85,7 +85,7 @@ public class SmsDatabase extends Database {
ContentValues values = new ContentValues(6); ContentValues values = new ContentValues(6);
values.put(ADDRESS, message.getDisplayOriginatingAddress()); values.put(ADDRESS, message.getDisplayOriginatingAddress());
values.put(DATE, new Long(System.currentTimeMillis())); values.put(DATE, Long.valueOf(System.currentTimeMillis()));
values.put(PROTOCOL, message.getProtocolIdentifier()); values.put(PROTOCOL, message.getProtocolIdentifier());
values.put(READ, Integer.valueOf(0)); values.put(READ, Integer.valueOf(0));

18
src/org/thoughtcrime/securesms/database/ThreadDatabase.java
View File

@ -16,20 +16,20 @@
*/ */
package org.thoughtcrime.securesms.database; package org.thoughtcrime.securesms.database;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.Recipients;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.Recipients;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
public class ThreadDatabase extends Database { public class ThreadDatabase extends Database {
private static final String TABLE_NAME = "thread"; private static final String TABLE_NAME = "thread";
@ -62,7 +62,7 @@ public class ThreadDatabase extends Database {
for (Recipient recipient : recipientList) { for (Recipient recipient : recipientList) {
// String number = NumberUtil.filterNumber(recipient.getNumber()); // String number = NumberUtil.filterNumber(recipient.getNumber());
String number = recipient.getNumber(); String number = recipient.getNumber();
recipientSet.add(new Long(DatabaseFactory.getAddressDatabase(context).getCanonicalAddress(number))); recipientSet.add(Long.valueOf(DatabaseFactory.getAddressDatabase(context).getCanonicalAddress(number)));
} }
long[] recipientArray = new long[recipientSet.size()]; long[] recipientArray = new long[recipientSet.size()];

15
src/org/thoughtcrime/securesms/sms/MultipartMessageHandler.java
View File

@ -16,19 +16,16 @@
*/ */
package org.thoughtcrime.securesms.sms; package org.thoughtcrime.securesms.sms;
import java.io.IOException; import android.util.Log;
import java.util.ArrayList;
import java.util.HashMap;
import org.thoughtcrime.securesms.protocol.Message;
import org.thoughtcrime.securesms.protocol.Prefix;
import org.thoughtcrime.securesms.protocol.WirePrefix; import org.thoughtcrime.securesms.protocol.WirePrefix;
import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.Conversions; import org.thoughtcrime.securesms.util.Conversions;
import org.thoughtcrime.securesms.util.Hex; import org.thoughtcrime.securesms.util.Hex;
import android.telephony.SmsManager; import java.io.IOException;
import android.util.Log; import java.util.ArrayList;
import java.util.HashMap;
public class MultipartMessageHandler { public class MultipartMessageHandler {
@ -173,11 +170,11 @@ public class MultipartMessageHandler {
currentId = idMap.get(recipient); currentId = idMap.get(recipient);
idMap.remove(recipient); idMap.remove(recipient);
} else { } else {
currentId = new Integer(0); currentId = Integer.valueOf(0);
} }
byte id = currentId.byteValue(); byte id = currentId.byteValue();
idMap.put(recipient, new Integer((currentId.intValue() + 1) % 255)); idMap.put(recipient, Integer.valueOf((currentId.intValue() + 1) % 255));
return id; return id;
} }