Skip to content

squid:S1192 - String literals should not be duplicated #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
georgekankava wants to merge 1 commit into
base: master
Choose a base branch
from
Open

squid:S1192 - String literals should not be duplicated #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions mobile/src/main/java/eu/inmite/apps/smsjizdenka/data/CityProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class CityProvider extends ContentProvider {
private static final UriMatcher sUriMatcher;
private static final int CITIES = 1;
private static final int CITY_ID = 2;
public static final String UNKNOWN_URI = "Unknown URI ";
private static HashMap<String, String> sProjectionMap;

static {
Expand Down Expand Up @@ -90,7 +91,7 @@ public int delete(Uri uri, String where, String[] whereArgs) {
break;

default:
throw new IllegalArgumentException("Unknown URI " + uri);
throw new IllegalArgumentException(UNKNOWN_URI + uri);
}

getContext().getContentResolver().notifyChange(uri, null);
Expand All @@ -106,15 +107,15 @@ public String getType(Uri uri) {
case CITY_ID:
return Cities.CONTENT_ITEM_TYPE;
default:
throw new IllegalArgumentException("Unknown URI " + uri);
throw new IllegalArgumentException(UNKNOWN_URI + uri);
}
}

@Override
public Uri insert(Uri uri, ContentValues initialValues) {
// Validate the requested uri
if (sUriMatcher.match(uri) != CITIES) {
throw new IllegalArgumentException("Unknown URI " + uri);
throw new IllegalArgumentException(UNKNOWN_URI + uri);
}

ContentValues values;
Expand Down Expand Up @@ -154,7 +155,7 @@ public Cursor query(Uri uri, String[] projection, String selection, String[] sel
qb.appendWhere(Cities._ID + "=" + uri.getPathSegments().get(1));
break;
default:
throw new IllegalArgumentException("Unknown URI " + uri);
throw new IllegalArgumentException(UNKNOWN_URI + uri);
}

// If no sort order is specified use the default
Expand Down Expand Up @@ -190,7 +191,7 @@ public int update(Uri uri, ContentValues values, String where, String[] whereArg
break;

default:
throw new IllegalArgumentException("Unknown URI " + uri);
throw new IllegalArgumentException(UNKNOWN_URI + uri);
}

getContext().getContentResolver().notifyChange(uri, null);
Expand Down
76 changes: 41 additions & 35 deletions mobile/src/main/java/eu/inmite/apps/smsjizdenka/data/DatabaseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
*/
public class DatabaseHelper extends SQLiteOpenHelper {

public static final String TEXT = " TEXT;";
public static final String ADD = " ADD ";
public static final String ALTER_TABLE = "ALTER TABLE ";
public static final String INTEGER = " INTEGER;";
public static final String TEXT_COMMA = " text,";
public static final String INTEGER_COMMA = " integer,";
public static final String DATABASE_HELPER_SERVICE = "databaseHelperService";
public static final String TICKET_TABLE_NAME = "ticket";
public static final String CITY_TABLE_NAME = "city";
Expand Down Expand Up @@ -111,16 +117,16 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {

if (oldVersion == 8) {
try {
db.execSQL("ALTER TABLE " + TICKET_TABLE_NAME + " ADD " + TicketProvider.Tickets.SMS_URI + " TEXT;");
db.execSQL(ALTER_TABLE + TICKET_TABLE_NAME + ADD + TicketProvider.Tickets.SMS_URI + TEXT);
} catch (SQLiteException sqle) {
// Maybe the table was altered already... Shouldn't be an issue.
}
oldVersion = 9;
}
if (oldVersion == 9) {
try {
db.execSQL("ALTER TABLE " + TICKET_TABLE_NAME + " ADD " + TicketProvider.Tickets.CITY_ID + " INTEGER;");
db.execSQL("ALTER TABLE " + TICKET_TABLE_NAME + " ADD " + TicketProvider.Tickets.TEXT + " TEXT;");
db.execSQL(ALTER_TABLE + TICKET_TABLE_NAME + ADD + TicketProvider.Tickets.CITY_ID + INTEGER);
db.execSQL(ALTER_TABLE + TICKET_TABLE_NAME + ADD + TicketProvider.Tickets.TEXT + TEXT);
db.execSQL("UPDATE " + TICKET_TABLE_NAME + " SET " + TicketProvider.Tickets.CITY_ID + " = 1");
} catch (SQLiteException sqle) {
// Maybe the table was altered already... Shouldn't be an issue.
Expand All @@ -129,10 +135,10 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
}
if (oldVersion == 10) {
try {
db.execSQL("ALTER TABLE " + TICKET_TABLE_NAME + " ADD " + TicketProvider.Tickets.ORDERED + " TEXT;");
db.execSQL("ALTER TABLE " + TICKET_TABLE_NAME + " ADD " + TicketProvider.Tickets.CITY + " TEXT;");
db.execSQL("ALTER TABLE " + TICKET_TABLE_NAME + " ADD " + TicketProvider.Tickets.STATUS + " INTEGER;");
db.execSQL("ALTER TABLE " + TICKET_TABLE_NAME + " ADD " + TicketProvider.Tickets.NOTIFICATION_ID + " INTEGER;");
db.execSQL(ALTER_TABLE + TICKET_TABLE_NAME + ADD + TicketProvider.Tickets.ORDERED + TEXT);
db.execSQL(ALTER_TABLE + TICKET_TABLE_NAME + ADD + TicketProvider.Tickets.CITY + TEXT);
db.execSQL(ALTER_TABLE + TICKET_TABLE_NAME + ADD + TicketProvider.Tickets.STATUS + INTEGER);
db.execSQL(ALTER_TABLE + TICKET_TABLE_NAME + ADD + TicketProvider.Tickets.NOTIFICATION_ID + INTEGER);

createTableCities(db);

Expand Down Expand Up @@ -188,23 +194,23 @@ private void createDB(SQLiteDatabase db) {
sql.append(Tickets._ID);
sql.append(" integer primary key autoincrement,");
sql.append(Tickets.ORDERED);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Tickets.VALID_FROM);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Tickets.VALID_TO);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Tickets.VALID_TO_DATE);
sql.append(" integer,");
sql.append(INTEGER_COMMA);
sql.append(Tickets.HASH);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Tickets.CITY_ID);
sql.append(" integer,");
sql.append(INTEGER_COMMA);
sql.append(Tickets.TEXT);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Tickets.CITY);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Tickets.STATUS);
sql.append(" integer,");
sql.append(INTEGER_COMMA);
sql.append(Tickets.NOTIFICATION_ID);
sql.append(" integer");
sql.append(");");
Expand All @@ -222,47 +228,47 @@ private void createTableCities(SQLiteDatabase db) {
sql.append(Cities._ID);
sql.append(" integer primary key,");
sql.append(Cities.ADDITIONAL_NUMBER_1);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.ADDITIONAL_NUMBER_2);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.ADDITIONAL_NUMBER_3);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.CITY);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.CITY_PUBTRAN);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.COUNTRY);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.CURRENCY);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.IDENTIFICATION);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.LAT);
sql.append(" double,");
sql.append(Cities.LON);
sql.append(" double,");
sql.append(Cities.NOTE);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.NUMBER);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.P_DATE_FROM);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.P_DATE_TO);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.P_HASH);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.PRICE);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.PRICE_NOTE);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.REQUEST);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.VALIDITY);
sql.append(" integer,");
sql.append(INTEGER_COMMA);
sql.append(Cities.DATE_FORMAT);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.CONFIRM_REQ);
sql.append(" text,");
sql.append(TEXT_COMMA);
sql.append(Cities.CONFIRM);
sql.append(" text");
sql.append(");");
Expand Down
11 changes: 6 additions & 5 deletions mobile/src/main/java/eu/inmite/apps/smsjizdenka/data/TicketProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
public class TicketProvider extends ContentProvider {

public static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".ticket";
public static final String UNKNOWN_URI = "Unknown URI ";
private static final UriMatcher sUriMatcher;
private static final int TICKETS = 1;
private static final int TICKET_ID = 2;
Expand Down Expand Up @@ -78,7 +79,7 @@ public int delete(Uri uri, String where, String[] whereArgs) {
break;

default:
throw new IllegalArgumentException("Unknown URI " + uri);
throw new IllegalArgumentException(UNKNOWN_URI + uri);
}

getContext().getContentResolver().notifyChange(uri, null);
Expand All @@ -94,15 +95,15 @@ public String getType(Uri uri) {
case TICKET_ID:
return Tickets.CONTENT_ITEM_TYPE;
default:
throw new IllegalArgumentException("Unknown URI " + uri);
throw new IllegalArgumentException(UNKNOWN_URI + uri);
}
}

@Override
public Uri insert(Uri uri, ContentValues initialValues) {
// Validate the requested uri
if (sUriMatcher.match(uri) != TICKETS) {
throw new IllegalArgumentException("Unknown URI " + uri);
throw new IllegalArgumentException(UNKNOWN_URI + uri);
}

ContentValues values;
Expand Down Expand Up @@ -143,7 +144,7 @@ public Cursor query(Uri uri, String[] projection, String selection, String[] sel
qb.appendWhere(Tickets._ID + "=" + uri.getPathSegments().get(1));
break;
default:
throw new IllegalArgumentException("Unknown URI " + uri);
throw new IllegalArgumentException(UNKNOWN_URI + uri);
}

// If no sort order is specified use the default
Expand Down Expand Up @@ -179,7 +180,7 @@ public int update(Uri uri, ContentValues values, String where, String[] whereArg
break;

default:
throw new IllegalArgumentException("Unknown URI " + uri);
throw new IllegalArgumentException(UNKNOWN_URI + uri);
}

getContext().getContentResolver().notifyChange(uri, null);
Expand Down
9 changes: 5 additions & 4 deletions mobile/src/main/java/eu/inmite/apps/smsjizdenka/data/model/City.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@
*/
public class City {

public static final String EUROPE_PRAGUE = "Europe/Prague";
private static final SimpleDateFormat format3339 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
private static final SimpleDateFormat timezone = new SimpleDateFormat("Z");

static {
format3339.setCalendar(Calendar.getInstance(TimeZone.getTimeZone("Europe/Prague"), new Locale("cs", "CZ")));
timezone.setCalendar(Calendar.getInstance(TimeZone.getTimeZone("Europe/Prague"), new Locale("cs", "CZ")));
format3339.setCalendar(Calendar.getInstance(TimeZone.getTimeZone(EUROPE_PRAGUE), new Locale("cs", "CZ")));
timezone.setCalendar(Calendar.getInstance(TimeZone.getTimeZone(EUROPE_PRAGUE), new Locale("cs", "CZ")));
}

public long id;
Expand Down Expand Up @@ -114,12 +115,12 @@ public City(
this.confirm = confirm;

this.sdf = new SimpleDateFormat(dateFormat);
sdf.setCalendar(Calendar.getInstance(TimeZone.getTimeZone("Europe/Prague"), new Locale("cs", "CZ")));
sdf.setCalendar(Calendar.getInstance(TimeZone.getTimeZone(EUROPE_PRAGUE), new Locale("cs", "CZ")));

String[] dateFormatParts = dateFormat.split(" ");
if (dateFormatParts.length > 1) {
this.sdfTime = new SimpleDateFormat(dateFormatParts[1]);
sdfTime.setCalendar(Calendar.getInstance(TimeZone.getTimeZone("Europe/Prague"), new Locale("cs", "CZ")));
sdfTime.setCalendar(Calendar.getInstance(TimeZone.getTimeZone(EUROPE_PRAGUE), new Locale("cs", "CZ")));
}
}

Expand Down
7 changes: 4 additions & 3 deletions mobile/src/main/java/eu/inmite/apps/smsjizdenka/dialog/MessageDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@
*/
public class MessageDialogFragment extends BaseDialogFragment {

public static String TAG = "message";
public static final String MESSAGE = "message";
public static String TAG = MESSAGE;

public static MessageDialogFragment newInstance(String message) {
MessageDialogFragment dialog = new MessageDialogFragment();
Bundle args = new Bundle();
args.putString("message", message);
args.putString(MESSAGE, message);
dialog.setArguments(args);
return dialog;
}
Expand All @@ -52,6 +53,6 @@ public void onClick(View view) {
}

private String getMessage() {
return getArguments().getString("message");
return getArguments().getString(MESSAGE);
}
}
7 changes: 4 additions & 3 deletions mobile/src/main/java/eu/inmite/apps/smsjizdenka/fragment/SettingsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
*/
public class SettingsFragment extends PreferenceListFragment {

public static final String SMS_CATEGORY = "sms_category";
private Context mContext;
SharedPreferences.OnSharedPreferenceChangeListener listener = new SharedPreferences
.OnSharedPreferenceChangeListener() {
Expand Down Expand Up @@ -114,12 +115,12 @@ public boolean onPreferenceClick(Preference preference) {
updateDataVersion(preferenceScreen);

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
PreferenceCategory pref = (PreferenceCategory) preferenceScreen.findPreference("sms_category");
PreferenceCategory pref = (PreferenceCategory) preferenceScreen.findPreference(SMS_CATEGORY);
pref.removePreference(pref.findPreference(Preferences.KEEP_IN_MESSAGING));
}
boolean dualSim = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1 && SubscriptionManager.from(getActivity()).getActiveSubscriptionInfoCount() >= 2;
if (!dualSim) {
PreferenceCategory pref = (PreferenceCategory) preferenceScreen.findPreference("sms_category");
PreferenceCategory pref = (PreferenceCategory) preferenceScreen.findPreference(SMS_CATEGORY);
pref.removePreference(pref.findPreference(Preferences.DUALSIM_SIM));
} else {
fillDualSimList(preferenceScreen);
Expand All @@ -128,7 +129,7 @@ public boolean onPreferenceClick(Preference preference) {

@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
private void fillDualSimList(PreferenceScreen preferenceScreen) {
PreferenceCategory category = (PreferenceCategory) preferenceScreen.findPreference("sms_category");
PreferenceCategory category = (PreferenceCategory) preferenceScreen.findPreference(SMS_CATEGORY);
ListPreference preference = (ListPreference) category.findPreference(Preferences.DUALSIM_SIM);
List<String> simIds = new ArrayList<>();
List<String> simNames = new ArrayList<>();
Expand Down
Loading