diff --git a/app/build.gradle b/app/build.gradle index f7c264d..9b5cda1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "asgardius.page.s3manager" minSdk 23 targetSdk 33 - versionCode 45 - versionName "0.3.6" + versionCode 46 + versionName "0.4.0" setProperty("archivesBaseName", "s3-manager-$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/asgardius/page/s3manager/MainActivity.java b/app/src/main/java/asgardius/page/s3manager/MainActivity.java index 4387e58..9a3530e 100644 --- a/app/src/main/java/asgardius/page/s3manager/MainActivity.java +++ b/app/src/main/java/asgardius/page/s3manager/MainActivity.java @@ -227,17 +227,27 @@ public class MainActivity extends AppCompatActivity { password = cursor.getString(2); location = cursor.getString(3); pdfendpoint = cursor.getString(4); - if (cursor.getString(5).equals("1")) { - style = true; - } else { + try { + style = cursor.getString(5).equals("1"); + } catch (Exception e) { + e.printStackTrace(); style = false; } + db.close(); //This launch file explorer using selected account explorer(); } } catch (Exception e) { e.printStackTrace(); + try { + db = dbHelper.getWritableDatabase(); + db.execSQL("alter table account add column style text"); + db.close(); + } catch (Exception f) { + Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show(); + finish(); + } } } @@ -270,9 +280,10 @@ public class MainActivity extends AppCompatActivity { password = cursor.getString(3); location = cursor.getString(4); pdfendpoint = cursor.getString(5); - if (cursor.getString(6).equals("1")) { - style = true; - } else { + try { + style = cursor.getString(6).equals("1"); + } catch (Exception e) { + e.printStackTrace(); style = false; } } @@ -282,6 +293,14 @@ public class MainActivity extends AppCompatActivity { //Toast.makeText(MainActivity.this, "This feature is not yet implemented", Toast.LENGTH_SHORT).show(); } catch (Exception e) { e.printStackTrace(); + try { + db = dbHelper.getWritableDatabase(); + db.execSQL("alter table account add column style text"); + db.close(); + } catch (Exception f) { + Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show(); + finish(); + } } } else if (menuItem.getTitle() == getResources().getString(R.string.accountdel_button)) { diff --git a/fastlane/metadata/android/en-US/changelogs/46.txt b/fastlane/metadata/android/en-US/changelogs/46.txt new file mode 100644 index 0000000..c4d90f8 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/46.txt @@ -0,0 +1,2 @@ +* Account edit screen redesign +* Add option to choose between virtual host style and path style for buckets (virtual host will be used by default) \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png index 7313851..c9a540e 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png index 94b559b..b37c6d2 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png differ diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png index eb187c8..cc310c1 100644 Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png differ diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/4.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/4.png index 7e23cff..2f2d533 100644 Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/4.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/4.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png index 84309e0..4e91526 100644 Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png differ diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.png index 6325236..f3a4f89 100644 Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.png and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.png differ