kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor: Organize Java classes in packages

Browse source
This commit is contained in:
Jakob Nixdorf 2017-08-09 12:50:10 +02:00
parent e5128b9ccb
commit 76133f4131
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
25 changed files with 67 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/androidTest/java/org/shadowice/flocke/andotp/ApplicationTest.java
View file

@ -31,6 +31,10 @@ import org.apache.commons.codec.binary.Base32;
import org.apache.commons.codec.binary.Hex;
import org.json.JSONException;
import org.json.JSONObject;
import org.shadowice.flocke.andotp.Database.Entry;
import org.shadowice.flocke.andotp.Utilities.DatabaseHelper;
import org.shadowice.flocke.andotp.Utilities.EncryptionHelper;
import org.shadowice.flocke.andotp.Utilities.TokenCalculator;
import java.io.File;
import java.io.IOException;
@ -51,7 +55,7 @@ import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import static org.shadowice.flocke.andotp.TokenCalculator.TOTP_DEFAULT_PERIOD;
import static org.shadowice.flocke.andotp.Utilities.TokenCalculator.TOTP_DEFAULT_PERIOD;
public class ApplicationTest extends ApplicationTestCase<Application> {

18
app/src/main/AndroidManifest.xml
View file

@ -11,10 +11,10 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:name=".MyApplication"
>
android:name=".MyApplication" >
<activity
android:name=".MainActivity"
android:name=".Activities.MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
@ -24,16 +24,16 @@
</intent-filter>
</activity>
<activity
android:name=".AboutActivity"
android:parentActivityName=".MainActivity"
android:name=".Activities.AboutActivity"
android:parentActivityName=".Activities.MainActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".BackupActivity"
android:parentActivityName=".MainActivity"
android:name=".Activities.BackupActivity"
android:parentActivityName=".Activities.MainActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".SettingsActivity"
android:parentActivityName=".MainActivity"
android:name=".Activities.SettingsActivity"
android:parentActivityName=".Activities.MainActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name="com.journeyapps.barcodescanner.CaptureActivity"

5
app/src/main/java/org/shadowice/flocke/andotp/AboutActivity.java → app/src/main/java/org/shadowice/flocke/andotp/Activities/AboutActivity.java
View file

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Activities;
import android.content.Intent;
import android.content.pm.PackageInfo;
@ -35,6 +35,9 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import org.shadowice.flocke.andotp.Utilities.ThemeHelper;
import org.shadowice.flocke.andotp.R;
import de.psdev.licensesdialog.LicensesDialog;
public class AboutActivity extends BaseActivity {

8
app/src/main/java/org/shadowice/flocke/andotp/BackupActivity.java → app/src/main/java/org/shadowice/flocke/andotp/Activities/BackupActivity.java
View file

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Activities;
import android.Manifest;
import android.app.AlertDialog;
@ -49,6 +49,12 @@ import org.openintents.openpgp.OpenPgpError;
import org.openintents.openpgp.OpenPgpSignatureResult;
import org.openintents.openpgp.util.OpenPgpApi;
import org.openintents.openpgp.util.OpenPgpServiceConnection;
import org.shadowice.flocke.andotp.Database.Entry;
import org.shadowice.flocke.andotp.Utilities.FileHelper;
import org.shadowice.flocke.andotp.Utilities.DatabaseHelper;
import org.shadowice.flocke.andotp.Utilities.EncryptionHelper;
import org.shadowice.flocke.andotp.Utilities.StorageHelper;
import org.shadowice.flocke.andotp.R;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;

4
app/src/main/java/org/shadowice/flocke/andotp/BaseActivity.java → app/src/main/java/org/shadowice/flocke/andotp/Activities/BaseActivity.java
View file

@ -1,10 +1,12 @@
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Activities;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import org.shadowice.flocke.andotp.R;
public class BaseActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {

9
app/src/main/java/org/shadowice/flocke/andotp/MainActivity.java → app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
View file

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Activities;
import android.animation.ObjectAnimator;
import android.app.AlertDialog;
@ -55,7 +55,12 @@ import android.widget.Toast;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import org.shadowice.flocke.andotp.ItemTouchHelper.SimpleItemTouchHelperCallback;
import org.shadowice.flocke.andotp.View.EntriesCardAdapter;
import org.shadowice.flocke.andotp.Database.Entry;
import org.shadowice.flocke.andotp.View.FloatingActionMenu;
import org.shadowice.flocke.andotp.View.ItemTouchHelper.SimpleItemTouchHelperCallback;
import org.shadowice.flocke.andotp.R;
import org.shadowice.flocke.andotp.Utilities.TokenCalculator;
public class MainActivity extends BaseActivity
implements SharedPreferences.OnSharedPreferenceChangeListener {

3
app/src/main/java/org/shadowice/flocke/andotp/SettingsActivity.java → app/src/main/java/org/shadowice/flocke/andotp/Activities/SettingsActivity.java
View file

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Activities;
import android.app.KeyguardManager;
import android.content.Intent;
@ -34,6 +34,7 @@ import android.view.ViewStub;
import org.openintents.openpgp.util.OpenPgpAppPreference;
import org.openintents.openpgp.util.OpenPgpKeyPreference;
import org.shadowice.flocke.andotp.R;
public class SettingsActivity extends BaseActivity
implements SharedPreferences.OnSharedPreferenceChangeListener{

3
app/src/main/java/org/shadowice/flocke/andotp/Entry.java → app/src/main/java/org/shadowice/flocke/andotp/Database/Entry.java
View file

@ -21,13 +21,14 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Database;
import android.net.Uri;
import org.apache.commons.codec.binary.Base32;
import org.json.JSONException;
import org.json.JSONObject;
import org.shadowice.flocke.andotp.Utilities.TokenCalculator;
import java.net.URL;
import java.util.Arrays;

2
app/src/main/java/org/shadowice/flocke/andotp/MyApplication.java
View file

@ -25,6 +25,8 @@ package org.shadowice.flocke.andotp;
import android.app.Application;
import org.shadowice.flocke.andotp.Utilities.PRNGFixes;
public class MyApplication extends Application {
@Override
public void onCreate() {

3
app/src/main/java/org/shadowice/flocke/andotp/DatabaseHelper.java → app/src/main/java/org/shadowice/flocke/andotp/Utilities/DatabaseHelper.java
View file

@ -21,12 +21,13 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Utilities;
import android.content.Context;
import android.net.Uri;
import org.json.JSONArray;
import org.shadowice.flocke.andotp.Database.Entry;
import java.io.File;
import java.util.ArrayList;

2
app/src/main/java/org/shadowice/flocke/andotp/EncryptionHelper.java → app/src/main/java/org/shadowice/flocke/andotp/Utilities/EncryptionHelper.java
View file

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Utilities;
import android.content.Context;

2
app/src/main/java/org/shadowice/flocke/andotp/FileHelper.java → app/src/main/java/org/shadowice/flocke/andotp/Utilities/FileHelper.java
View file

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Utilities;
import android.content.Context;
import android.net.Uri;

2
app/src/main/java/org/shadowice/flocke/andotp/PRNGFixes.java → app/src/main/java/org/shadowice/flocke/andotp/Utilities/PRNGFixes.java
View file

@ -1,4 +1,4 @@
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Utilities;
/*
* This software is provided 'as-is', without any express or implied

2
app/src/main/java/org/shadowice/flocke/andotp/SecretKeyWrapper.java → app/src/main/java/org/shadowice/flocke/andotp/Utilities/SecretKeyWrapper.java
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Utilities;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;

2
app/src/main/java/org/shadowice/flocke/andotp/StorageHelper.java → app/src/main/java/org/shadowice/flocke/andotp/Utilities/StorageHelper.java
View file

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Utilities;
import android.os.Environment;

2
app/src/main/java/org/shadowice/flocke/andotp/ThemeHelper.java → app/src/main/java/org/shadowice/flocke/andotp/Utilities/ThemeHelper.java
View file

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Utilities;
import android.content.Context;
import android.content.res.Resources;

2
app/src/main/java/org/shadowice/flocke/andotp/TokenCalculator.java → app/src/main/java/org/shadowice/flocke/andotp/Utilities/TokenCalculator.java
View file

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.Utilities;
import java.nio.ByteBuffer;
import java.security.InvalidKeyException;

7
app/src/main/java/org/shadowice/flocke/andotp/EntriesCardAdapter.java → app/src/main/java/org/shadowice/flocke/andotp/View/EntriesCardAdapter.java
View file

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.View;
import android.app.AlertDialog;
import android.content.ClipData;
@ -42,7 +42,10 @@ import android.widget.Filterable;
import android.widget.FrameLayout;
import android.widget.Toast;
import org.shadowice.flocke.andotp.ItemTouchHelper.ItemTouchHelperAdapter;
import org.shadowice.flocke.andotp.Database.Entry;
import org.shadowice.flocke.andotp.Utilities.DatabaseHelper;
import org.shadowice.flocke.andotp.View.ItemTouchHelper.ItemTouchHelperAdapter;
import org.shadowice.flocke.andotp.R;
import java.util.ArrayList;
import java.util.Collections;

6
app/src/main/java/org/shadowice/flocke/andotp/EntryViewHolder.java → app/src/main/java/org/shadowice/flocke/andotp/View/EntryViewHolder.java
View file

@ -1,4 +1,4 @@
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.View;
import android.content.Context;
import android.graphics.ColorFilter;
@ -11,7 +11,9 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import org.shadowice.flocke.andotp.ItemTouchHelper.ItemTouchHelperViewHolder;
import org.shadowice.flocke.andotp.Utilities.ThemeHelper;
import org.shadowice.flocke.andotp.View.ItemTouchHelper.ItemTouchHelperViewHolder;
import org.shadowice.flocke.andotp.R;
public class EntryViewHolder extends RecyclerView.ViewHolder
implements ItemTouchHelperViewHolder {

4
app/src/main/java/org/shadowice/flocke/andotp/FloatingActionMenu.java → app/src/main/java/org/shadowice/flocke/andotp/View/FloatingActionMenu.java
View file

@ -20,7 +20,7 @@
* SOFTWARE.
*/
package org.shadowice.flocke.andotp;
package org.shadowice.flocke.andotp.View;
import android.content.Context;
import android.support.constraint.ConstraintLayout;
@ -32,6 +32,8 @@ import android.view.animation.AnimationUtils;
import android.view.animation.LinearInterpolator;
import android.widget.LinearLayout;
import org.shadowice.flocke.andotp.R;
public class FloatingActionMenu {
private boolean isFabMenuOpen = false;

2
app/src/main/java/org/shadowice/flocke/andotp/ItemTouchHelper/ItemTouchHelperAdapter.java → app/src/main/java/org/shadowice/flocke/andotp/View/ItemTouchHelper/ItemTouchHelperAdapter.java
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.shadowice.flocke.andotp.ItemTouchHelper;
package org.shadowice.flocke.andotp.View.ItemTouchHelper;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.helper.ItemTouchHelper;

2
app/src/main/java/org/shadowice/flocke/andotp/ItemTouchHelper/ItemTouchHelperViewHolder.java → app/src/main/java/org/shadowice/flocke/andotp/View/ItemTouchHelper/ItemTouchHelperViewHolder.java
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.shadowice.flocke.andotp.ItemTouchHelper;
package org.shadowice.flocke.andotp.View.ItemTouchHelper;
import android.support.v7.widget.helper.ItemTouchHelper;

2
app/src/main/java/org/shadowice/flocke/andotp/ItemTouchHelper/SimpleItemTouchHelperCallback.java → app/src/main/java/org/shadowice/flocke/andotp/View/ItemTouchHelper/SimpleItemTouchHelperCallback.java
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.shadowice.flocke.andotp.ItemTouchHelper;
package org.shadowice.flocke.andotp.View.ItemTouchHelper;
import android.graphics.Canvas;
import android.support.v7.widget.GridLayoutManager;

2
app/src/main/res/layout/activity_main.xml
View file

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="org.shadowice.flocke.andotp.MainActivity">
tools:context="org.shadowice.flocke.andotp.Activities.MainActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/content_main.xml
View file

@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="org.shadowice.flocke.andotp.MainActivity"
tools:context="org.shadowice.flocke.andotp.Activities.MainActivity"
tools:showIn="@layout/activity_main">
<android.support.v7.widget.RecyclerView