Feature/backup integration

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libs/privacy-friendly-backup-api"]
+	path = libs/privacy-friendly-backup-api
+	url = [email protected]:SecUSo/privacy-friendly-backup-api.git

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.3'
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "org.secuso.privacyfriendlyrecknoningskills"
         minSdkVersion 17
-        targetSdkVersion 26
-        versionCode 3
-        versionName "1.0.2"
+        targetSdkVersion 33
+        versionCode 4
+        versionName "1.1"
     }
     buildTypes {
         release {
@@ -20,10 +20,29 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.android.support:design:26.1.0'
-    compile 'com.android.support:support-v4:26.1.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    testCompile 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+    implementation 'androidx.fragment:fragment:1.6.0'
+    implementation 'androidx.drawerlayout:drawerlayout:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+
+    // Backup
+    implementation project(path: ':backup-api')
+    def work_version = "2.4.0"
+    implementation "androidx.work:work-runtime:$work_version"
+    implementation "androidx.work:work-runtime-ktx:$work_version"
+    androidTestImplementation "androidx.work:work-testing:$work_version"
+    implementation 'androidx.sqlite:sqlite-ktx:2.3.1'
+
+    constraints {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
+            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+        }
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
+            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+        }
+    }
 }

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.secuso.privacyfriendlyreckoningskills">
 
     <supports-screens
@@ -11,14 +12,16 @@
         android:xlargeScreens="true" />
 
     <application
+        android:name=".PFReckoningSkills"
         android:allowBackup="true"
         android:icon="@mipmap/icon_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
             android:name="org.secuso.privacyfriendlyreckoningskills.activities.SplashActivity"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -70,6 +73,21 @@
             android:name="org.secuso.privacyfriendlyreckoningskills.activities.ScoreActivity"
             android:label="@string/title_activity_score"
             android:parentActivityName="org.secuso.privacyfriendlyreckoningskills.activities.MainActivity" />
+
+        <service
+            android:name=".backup.PFABackupService"
+            android:enabled="true"
+            android:exported="true"
+            android:process=":backup"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="org.secuso.privacyfriendlybackup.api.pfa.PFAAuthService" />
+            </intent-filter>
+        </service>
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
     </application>
 
 </manifest>

app/src/main/java/org/secuso/privacyfriendlyreckoningskills/PFReckoningSkills.kt

@@ -0,0 +1,21 @@
+package org.secuso.privacyfriendlyreckoningskills
+
+import android.app.Application
+import android.util.Log
+import androidx.work.Configuration
+import org.secuso.privacyfriendlybackup.api.pfa.BackupManager
+import org.secuso.privacyfriendlyreckoningskills.backup.BackupCreator
+import org.secuso.privacyfriendlyreckoningskills.backup.BackupRestorer
+
+class PFReckoningSkills : Application(), Configuration.Provider {
+
+    override fun onCreate() {
+        super.onCreate()
+        BackupManager.backupCreator = BackupCreator()
+        BackupManager.backupRestorer = BackupRestorer()
+    }
+
+    override fun getWorkManagerConfiguration(): Configuration {
+        return Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build()
+    }
+}

app/src/main/java/org/secuso/privacyfriendlyreckoningskills/activities/AboutActivity.java

@@ -15,8 +15,8 @@
 package org.secuso.privacyfriendlyreckoningskills.activities;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.widget.TextView;

app/src/main/java/org/secuso/privacyfriendlyreckoningskills/activities/AppCompatPreferenceActivity.java

@@ -17,11 +17,11 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/secuso/privacyfriendlyreckoningskills/activities/BaseActivity.java

@@ -21,14 +21,14 @@
 import android.os.Handler;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
-import android.support.design.widget.NavigationView;
-import android.support.design.widget.NavigationView.OnNavigationItemSelectedListener;
-import android.support.v4.app.TaskStackBuilder;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.navigation.NavigationView;
+import com.google.android.material.navigation.NavigationView.OnNavigationItemSelectedListener;
+import androidx.core.app.TaskStackBuilder;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 

app/src/main/java/org/secuso/privacyfriendlyreckoningskills/activities/ExerciseActivity.java

@@ -23,9 +23,9 @@
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.text.InputType;
 import android.view.View;
 import android.widget.Chronometer;

app/src/main/java/org/secuso/privacyfriendlyreckoningskills/activities/MainActivity.java

@@ -18,10 +18,10 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/secuso/privacyfriendlyreckoningskills/activities/ResultActivity.java

@@ -20,8 +20,8 @@
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;

app/src/main/java/org/secuso/privacyfriendlyreckoningskills/activities/ScoreActivity.java

@@ -15,12 +15,12 @@
 package org.secuso.privacyfriendlyreckoningskills.activities;
 
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 
 import org.secuso.privacyfriendlyreckoningskills.R;
 

app/src/main/java/org/secuso/privacyfriendlyreckoningskills/activities/ScoreFragment.java

@@ -16,7 +16,7 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/secuso/privacyfriendlyreckoningskills/activities/SplashActivity.java

@@ -16,7 +16,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import org.secuso.privacyfriendlyreckoningskills.tutorial.TutorialActivity;
 

app/src/main/java/org/secuso/privacyfriendlyreckoningskills/backup/BackupCreator.kt

@@ -0,0 +1,61 @@
+package org.secuso.privacyfriendlyreckoningskills.backup
+
+
+import android.content.Context
+import android.preference.PreferenceManager
+import android.util.JsonWriter
+import android.util.Log
+import org.secuso.privacyfriendlybackup.api.backup.DatabaseUtil.getSupportSQLiteOpenHelper
+import org.secuso.privacyfriendlybackup.api.backup.DatabaseUtil.writeDatabase
+import org.secuso.privacyfriendlybackup.api.backup.PreferenceUtil.writePreferences
+import org.secuso.privacyfriendlybackup.api.pfa.IBackupCreator
+import org.secuso.privacyfriendlyreckoningskills.database.PFASQLiteHelper
+import java.io.OutputStream
+import java.io.OutputStreamWriter
+
+class BackupCreator : IBackupCreator {
+    override fun writeBackup(context: Context, outputStream: OutputStream): Boolean {
+        Log.d(TAG, "createBackup() started")
+        val outputStreamWriter = OutputStreamWriter(outputStream, Charsets.UTF_8)
+        val writer = JsonWriter(outputStreamWriter)
+        writer.setIndent("")
+
+        try {
+            writer.beginObject()
+
+            Log.d(TAG, "Writing database")
+            writer.name("database")
+
+            val database = getSupportSQLiteOpenHelper(context, PFASQLiteHelper.DATABASE_NAME).readableDatabase
+
+            writeDatabase(writer, database)
+            database.close()
+
+            Log.d(TAG, "Writing preferences")
+            writer.name("preferences")
+
+            val pref = PreferenceManager.getDefaultSharedPreferences(context.applicationContext)
+            writePreferences(writer, pref)
+
+            Log.d(TAG, "Writing highscores")
+            writer.name("highscore")
+
+            val highscore = context.applicationContext.getSharedPreferences("pfa-math-highscore", 0 )
+            writePreferences(writer, highscore)
+
+            writer.endObject()
+            writer.close()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error occurred", e)
+            e.printStackTrace()
+            return false
+        }
+
+        Log.d(TAG, "Backup created successfully")
+        return true
+    }
+
+    companion object {
+        const val TAG = "PFABackupCreator"
+    }
+}