lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-09 23:41:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

first attempt to call backupprefs. Crash with null pointer exception (see lne 811)

Browse source
This commit is contained in:
jacques 2024-08-19 16:03:52 +02:00
parent 24c32796ce
commit 06e879a9ae
1 changed files with 50 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
app/src/main/java/net/foucry/pilldroid/DrugListActivity.java
View file

@ -40,12 +40,9 @@ import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import androidx.room.Room; import androidx.room.Room;
import androidx.room.RoomDatabase;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
@ -61,7 +58,6 @@ import net.foucry.pilldroid.databases.PrescriptionDatabase;
import net.foucry.pilldroid.models.Medicine; import net.foucry.pilldroid.models.Medicine;
import net.foucry.pilldroid.models.Prescription; import net.foucry.pilldroid.models.Prescription;
import de.raphaelebner.roomdatabasebackup.core.RoomBackup;
import java.io.File; import java.io.File;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
@ -69,6 +65,8 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Objects; import java.util.Objects;
import de.raphaelebner.roomdatabasebackup.core.RoomBackup;
/** /**
* An activity representing a list of Drugs is activity * An activity representing a list of Drugs is activity
* has different presentations for handset and tablet-size devices. On * has different presentations for handset and tablet-size devices. On
@ -79,7 +77,6 @@ import java.util.Objects;
*/ */
public class DrugListActivity extends AppCompatActivity { public class DrugListActivity extends AppCompatActivity {
private static final String TAG = DrugListActivity.class.getName(); private static final String TAG = DrugListActivity.class.getName();
private static final String SECRET_PASSWORD = ;
public final int CUSTOMIZED_REQUEST_CODE = 0x0000ffff; public final int CUSTOMIZED_REQUEST_CODE = 0x0000ffff;
// Barcode Scanner usage // Barcode Scanner usage
@ -204,7 +201,7 @@ public class DrugListActivity extends AppCompatActivity {
} }
FloatingActionButton mFloatingActionButton = findViewById(R.id.fab); FloatingActionButton mFloatingActionButton = findViewById(R.id.fab);
mFloatingActionButton.setOnClickListener(v-> onButtonClick()); mFloatingActionButton.setOnClickListener(v -> onButtonClick());
if (DEMO) { if (DEMO) {
PrescriptionsDAO prescriptionsDAO = prescriptions.getPrescriptionsDAO(); PrescriptionsDAO prescriptionsDAO = prescriptions.getPrescriptionsDAO();
@ -394,8 +391,7 @@ public class DrugListActivity extends AppCompatActivity {
if (s.length() == 8) { if (s.length() == 8) {
ok.setEnabled(true); ok.setEnabled(true);
ok.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(editText.getContext(), R.drawable.rounded_btn))); ok.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(editText.getContext(), R.drawable.rounded_btn)));
} } else {
else {
ok.setEnabled(false); ok.setEnabled(false);
ok.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(editText.getContext(), R.drawable.rounded_btn_disabled))); ok.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(editText.getContext(), R.drawable.rounded_btn_disabled)));
} }
@ -757,10 +753,7 @@ public class DrugListActivity extends AppCompatActivity {
}); });
dlg.show();*/ dlg.show();*/
Button btn_export = findViewById(R.id.switch_btn_export);
Button btn_import = findViewById(R.id.switch_btn_import);
Button btn_properties = findViewById(R.id.btn_properties);
Button btn_backupLocation = findViewById(R.id.btn_backup_location);
/*recyclerView.setAdapter(adapter); /*recyclerView.setAdapter(adapter);
recyclerView.setLayoutManager(new LinearLayoutManager(this)); recyclerView.setLayoutManager(new LinearLayoutManager(this));
@ -800,17 +793,22 @@ public class DrugListActivity extends AppCompatActivity {
// startActivity(intent); // startActivity(intent);
// }); // });
Button btn_export = findViewById(R.id.switch_btn_export);
Button btn_import = findViewById(R.id.switch_btn_import);
Button btn_properties = findViewById(R.id.btn_properties);
Button btn_backupLocation = findViewById(R.id.btn_backup_location);
encryptBackup = sharedPreferences.getBoolean(spEncryptBackup, true); encryptBackup = sharedPreferences.getBoolean(spEncryptBackup, true);
storageLocation = sharedPreferences.getInt(spStorageLocation, 1); storageLocation = sharedPreferences.getInt(spStorageLocation, 1);
enableLog = sharedPreferences.getBoolean(spEnableLog, true); enableLog = sharedPreferences.getBoolean(spEnableLog, true);
useMaxFileCount = sharedPreferences.getBoolean(spUseMaxFileCount, false); useMaxFileCount = sharedPreferences.getBoolean(spUseMaxFileCount, false);
final String[] multiItems = new String[] { "Encrypt Backup", "enable Log", "use maxFileCount = 5" }; final String[] multiItems = new String[]{"Encrypt Backup", "enable Log", "use maxFileCount = 5"};
final boolean[] checkedItems = new boolean[] { encryptBackup, enableLog, useMaxFileCount }; final boolean[] checkedItems = new boolean[]{encryptBackup, enableLog, useMaxFileCount};
final String[] storageItems = new String[] { "Internal", "External", "Custom Dialog", "Custom File" }; final String[] storageItems = new String[]{"Internal", "External", "Custom Dialog", "Custom File"};
/*---------------------set Properties--------------------------*/ /*---------------------set Properties--------------------------*/
btn_properties.setOnClickListener(v -> { btn_properties.setOnClickListener(v -> { // TODO: Null pointer exception → application crash [should be the same with other button]
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder( MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(
DrugListActivity.this); DrugListActivity.this);
materialAlertDialogBuilder.setTitle("Change Properties"); materialAlertDialogBuilder.setTitle("Change Properties");
@ -868,32 +866,46 @@ public class DrugListActivity extends AppCompatActivity {
}); });
Log.i(TAG, "ok button"); Log.i(TAG, "ok button");
PrescriptionDatabase prescriptions = PrescriptionDatabase.getInstanceDatabase(this); PrescriptionDatabase prescriptions = PrescriptionDatabase.getInstanceDatabase(this);
final RoomBackup roomBackup = new RoomBackup(DrugListActivity.this); final RoomBackup roomBackup = new RoomBackup(DrugListActivity.this);
if ( btn_export.isEnabled() ) { if (btn_export.isEnabled()) {
// TODO: call `make backup btn_export.setOnClickListener(v -> {
roomBackup.backupLocation(storageLocation); roomBackup.backupLocation(storageLocation);
roomBackup.database(PrescriptionDatabase.getInstanceDatabase(this)); roomBackup.backupLocationCustomFile(new File(this.getFilesDir() + "/databasebackup/geilesBackup.sqlite3"));
roomBackup.enableLogDebug(enableLog); roomBackup.database(PrescriptionDatabase.getInstanceDatabase(getApplicationContext()));
roomBackup.backupIsEncrypted(encryptBackup); roomBackup.enableLogDebug(enableLog);
roomBackup.customEncryptPassword(DrugListActivity.SECRET_PASSWORD); roomBackup.backupIsEncrypted(encryptBackup);
if (useMaxFileCount) //roomBackup.customEncryptPassword(MainActivity.SECRET_PASSWORD);
roomBackup.maxFileCount(5); if (useMaxFileCount)
roomBackup.onCompleteListener((success, message, exitCode) -> { roomBackup.maxFileCount(5);
Log.d(TAG, "oncomplete: " + success + "message: " + message + ",exitCode: " + exitCode); roomBackup.onCompleteListener((success, message, exitCode) -> {
if (success) Log.d(TAG, "oncomplete: " + success + ", message: " + message + ", exitCode: " + exitCode);
roomBackup.restartApp(new Intent(getApplicationContext(), DrugListActivity.class)); if (success)
}); roomBackup.restartApp(new Intent(getApplicationContext(), DrugListActivity.class));
roomBackup.backup(); });
roomBackup.backup();
});
} else {
btn_import.setOnClickListener(v -> {
roomBackup.backupLocation(storageLocation);
roomBackup.backupLocationCustomFile(new File(this.getFilesDir() + "/databasebackup/geilesBackup.sqlite3"));
roomBackup.database(PrescriptionDatabase.getInstanceDatabase(getApplicationContext()));
roomBackup.enableLogDebug(enableLog);
roomBackup.backupIsEncrypted(encryptBackup);
//roomBackup.customEncryptPassword(MainActivity.SECRET_PASSWORD);
roomBackup.onCompleteListener((success, message, exitCode) -> {
Log.d(TAG, "oncomplete: " + success + ", message: " + message + ", exitCode: " + exitCode);
if (success)
roomBackup.restartApp(new Intent(getApplicationContext(), DrugListActivity.class));
});
roomBackup.restore();
} else { });
// TODO: call restore backup }
//prescriptions.restore();
} }
} }
}
/* /*