TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-23 08:16:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debug merge issues

Browse Source
This commit is contained in:
Niels Andriesse
2019-08-08 11:29:40 +10:00
parent 1822e87f7c
commit 5936c16c47
4 changed files with 150 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
View File

@@ -30,11 +30,11 @@ public class DatabaseContentProviders {
}
public static class Sticker extends NoopContentProvider {
public static final Uri CONTENT_URI = Uri.parse("content://org.thoughtcrime.securesms.database.sticker");
public static final Uri CONTENT_URI = Uri.parse("content://network.loki.securesms.database.sticker");
}
public static class StickerPack extends NoopContentProvider {
public static final Uri CONTENT_URI = Uri.parse("content://org.thoughtcrime.securesms.database.stickerpack");
public static final Uri CONTENT_URI = Uri.parse("content://network.loki.securesms.database.stickerpack");
}
private static abstract class NoopContentProvider extends ContentProvider {

2
src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
View File

@@ -131,8 +131,6 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
db.execSQL(LokiThreadDatabase.getCreateSessionResetTableCommand());
db.execSQL(LokiUserDisplayNameDatabase.getCreateTableCommand());
executeStatements(db, SearchDatabase.CREATE_TABLE);
executeStatements(db, JobDatabase.CREATE_TABLE);
executeStatements(db, SmsDatabase.CREATE_INDEXS);
executeStatements(db, MmsDatabase.CREATE_INDEXS);
executeStatements(db, AttachmentDatabase.CREATE_INDEXS);

3
src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
View File

@@ -34,7 +34,7 @@ public class WelcomeActivity extends BaseActionBarActivity {
private void onContinueClicked() {
Permissions.with(this)
.request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
.ifNecessary(false)
.ifNecessary()
.withRationaleDialog(getString(R.string.activity_landing_permission_dialog_message), R.drawable.ic_folder_white_48dp)
.onAnyResult(() -> {
TextSecurePreferences.setHasSeenWelcomeScreen(WelcomeActivity.this, true);
@@ -46,7 +46,6 @@ public class WelcomeActivity extends BaseActionBarActivity {
}
startActivity(nextIntent);
overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
finish();
})
.execute();