From 68fec9a1623437f26dbb4cf590d80ee2a15806e5 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Wed, 17 Jan 2018 22:20:24 +0100 Subject: [PATCH] Lint fixes --- app/src/main/AndroidManifest.xml | 12 ++--- .../main/java/com/zegoggles/smssync/App.java | 2 +- .../smssync/activity/MainActivity.java | 9 ---- .../calendar/CalendarAccessorPost40.java | 5 ++ .../smssync/preferences/AuthPreferences.java | 2 +- .../preferences/BackupManagerWrapper.java | 27 ----------- .../preferences/PreferenceBackupAgent.java | 46 ------------------- app/src/main/res/layout/status.xml | 9 +++- app/src/main/res/xml/backup_descriptor.xml | 5 ++ 9 files changed, 26 insertions(+), 91 deletions(-) delete mode 100644 app/src/main/java/com/zegoggles/smssync/preferences/BackupManagerWrapper.java delete mode 100644 app/src/main/java/com/zegoggles/smssync/preferences/PreferenceBackupAgent.java create mode 100644 app/src/main/res/xml/backup_descriptor.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 167aedd8f..a16fb1fbb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -33,12 +33,12 @@ + android:label="@string/app_name" + android:description="@string/app_description" + android:theme="@style/SMSBackupPlusTheme.Dark" + android:name="App" + android:allowBackup="true" + android:fullBackupContent="@xml/backup_descriptor"> diff --git a/app/src/main/java/com/zegoggles/smssync/App.java b/app/src/main/java/com/zegoggles/smssync/App.java index d5acefeb4..a4533abaa 100644 --- a/app/src/main/java/com/zegoggles/smssync/App.java +++ b/app/src/main/java/com/zegoggles/smssync/App.java @@ -117,7 +117,7 @@ private void setBroadcastReceiversEnabled(boolean enabled) { private void enableOrDisableComponent(boolean enabled, Class component) { if (LOCAL_LOGV) { - Log.v(TAG, "enableComponent("+enabled+", "+component.getSimpleName()+")"); + Log.v(TAG, "enableOrDisableComponent("+enabled+", "+component.getSimpleName()+")"); } // NB: changes made via setComponentEnabledSetting are persisted across reboots getPackageManager().setComponentEnabledSetting( diff --git a/app/src/main/java/com/zegoggles/smssync/activity/MainActivity.java b/app/src/main/java/com/zegoggles/smssync/activity/MainActivity.java index 290ab1e34..031a06005 100644 --- a/app/src/main/java/com/zegoggles/smssync/activity/MainActivity.java +++ b/app/src/main/java/com/zegoggles/smssync/activity/MainActivity.java @@ -18,7 +18,6 @@ import android.annotation.TargetApi; import android.content.Intent; -import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; import android.provider.Telephony.Sms; @@ -56,7 +55,6 @@ import com.zegoggles.smssync.activity.fragments.MainSettings; import com.zegoggles.smssync.auth.OAuth2Client; import com.zegoggles.smssync.preferences.AuthPreferences; -import com.zegoggles.smssync.preferences.BackupManagerWrapper; import com.zegoggles.smssync.preferences.Preferences; import com.zegoggles.smssync.service.BackupType; import com.zegoggles.smssync.service.SmsBackupService; @@ -128,13 +126,6 @@ public void onCreate(Bundle bundle) { changeDefaultPackageIntent = new Intent(ACTION_CHANGE_DEFAULT).putExtra(EXTRA_PACKAGE_NAME, getPackageName()); preferences = new Preferences(this); - preferences.getSharedPreferences().registerOnSharedPreferenceChangeListener( - new SharedPreferences.OnSharedPreferenceChangeListener() { - public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { - BackupManagerWrapper.dataChanged(MainActivity.this); - } - } - ); if (bundle == null) { showFragment(new MainSettings(), null); } diff --git a/app/src/main/java/com/zegoggles/smssync/calendar/CalendarAccessorPost40.java b/app/src/main/java/com/zegoggles/smssync/calendar/CalendarAccessorPost40.java index 7fae86d52..110339d15 100644 --- a/app/src/main/java/com/zegoggles/smssync/calendar/CalendarAccessorPost40.java +++ b/app/src/main/java/com/zegoggles/smssync/calendar/CalendarAccessorPost40.java @@ -60,6 +60,9 @@ public boolean addEntry(long calendarId, @NonNull Date when, int duration, @NonN } catch (IllegalArgumentException e) { Log.e(TAG, "could not add calendar entry", e); return false; + } catch (SecurityException e) { + Log.w(TAG, "could not add calendar entry (permission)", e); + return false; } } @@ -89,6 +92,8 @@ public Map getCalendars() { } } catch (IllegalArgumentException e) { Log.e(TAG, "calendars not available", e); + } catch (SecurityException e) { + Log.e(TAG, "calendar permission missing", e); } finally { if (cursor != null) { cursor.close(); diff --git a/app/src/main/java/com/zegoggles/smssync/preferences/AuthPreferences.java b/app/src/main/java/com/zegoggles/smssync/preferences/AuthPreferences.java index 9935818cc..50404a531 100644 --- a/app/src/main/java/com/zegoggles/smssync/preferences/AuthPreferences.java +++ b/app/src/main/java/com/zegoggles/smssync/preferences/AuthPreferences.java @@ -57,7 +57,7 @@ public AuthPreferences(Context context) { /* package */ AuthPreferences(Context context, ServerPreferences serverPreferences) { this.context = context.getApplicationContext(); this.serverPreferences = serverPreferences; - this.preferences = PreferenceManager.getDefaultSharedPreferences(this.context); + this.preferences = PreferenceManager.getDefaultSharedPreferences(context); } public String getOauth2Token() { diff --git a/app/src/main/java/com/zegoggles/smssync/preferences/BackupManagerWrapper.java b/app/src/main/java/com/zegoggles/smssync/preferences/BackupManagerWrapper.java deleted file mode 100644 index 6537d0004..000000000 --- a/app/src/main/java/com/zegoggles/smssync/preferences/BackupManagerWrapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.zegoggles.smssync.preferences; - -import android.app.backup.BackupManager; - -public class BackupManagerWrapper { - private static Boolean available = null; - - private BackupManagerWrapper() {} - - private static boolean available() { - if (available == null) { - try { - Class.forName("android.app.backup.BackupManager"); - available = Boolean.TRUE; - } catch (Exception ex) { - available = Boolean.FALSE; - } - } - return available; - } - - public static void dataChanged(android.content.Context context) { - if (available()) { - new BackupManager(context).dataChanged(); - } - } -} diff --git a/app/src/main/java/com/zegoggles/smssync/preferences/PreferenceBackupAgent.java b/app/src/main/java/com/zegoggles/smssync/preferences/PreferenceBackupAgent.java deleted file mode 100644 index 628d7ba77..000000000 --- a/app/src/main/java/com/zegoggles/smssync/preferences/PreferenceBackupAgent.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.zegoggles.smssync.preferences; - -import android.annotation.TargetApi; -import android.app.backup.BackupAgentHelper; -import android.app.backup.BackupDataInput; -import android.app.backup.BackupDataOutput; -import android.app.backup.SharedPreferencesBackupHelper; -import android.os.ParcelFileDescriptor; -import android.util.Log; - -import java.io.IOException; - -import static com.zegoggles.smssync.App.LOCAL_LOGV; -import static com.zegoggles.smssync.App.TAG; - -/** - * @noinspection UnusedDeclaration - */ -public class PreferenceBackupAgent extends BackupAgentHelper { - // A key to uniquely identify the set of backup data - private static final String PREFS_BACKUP_KEY = "prefs"; - - @Override - public void onCreate() { - SharedPreferencesBackupHelper helper = new SharedPreferencesBackupHelper(this, - getPackageName() + "_preferences"); - - addHelper(PREFS_BACKUP_KEY, helper); - } - - @Override - public void onBackup(ParcelFileDescriptor oldState, BackupDataOutput data, - ParcelFileDescriptor newState) throws IOException { - - if (LOCAL_LOGV) Log.v(TAG, "onBackup()"); - super.onBackup(oldState, data, newState); - } - - - @Override - public void onRestore(BackupDataInput data, int appVersionCode, - ParcelFileDescriptor newState) throws IOException { - if (LOCAL_LOGV) Log.v(TAG, "onRestore()"); - super.onRestore(data, appVersionCode, newState); - } -} diff --git a/app/src/main/res/layout/status.xml b/app/src/main/res/layout/status.xml index 469d51ad3..ea9fc0b7e 100644 --- a/app/src/main/res/layout/status.xml +++ b/app/src/main/res/layout/status.xml @@ -18,6 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:src="@drawable/ic_done"/> @@ -36,6 +39,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignLeft="@id/status_label" + android:layout_alignStart="@id/status_label" android:layout_below="@id/status_icon" android:orientation="vertical"> @@ -45,7 +49,10 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:indeterminate="false" - android:paddingRight="10dip" /> + android:paddingLeft="0dip" + android:paddingStart="0dip" + android:paddingRight="10dip" + android:paddingEnd="10dip"/> + + + +