change package ID to make F-Droid happy

use library from maven fix minor bugs: - make text in sync error message activity readable (was white on grey...) - repair the preferences link in android settings - don't crash when clicking "done" on already created account
luelista · Feb 14, 2019 · 00afdf5 · 00afdf5
1 parent 9609852
commit 00afdf5
Show file tree

Hide file tree

Showing 33 changed files with 134 additions and 161 deletions.
diff --git a/ldap_sync_2.0_as.iml → .idea/LDAP-Sync.iml b/ldap_sync_2.0_as.iml → .idea/LDAP-Sync.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/app.iml b/app/app.iml
@@ -49,20 +49,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -84,37 +84,27 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged-not-compiled-resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/unitTestConfig" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
@@ -141,7 +131,6 @@
     <orderEntry type="library" scope="TEST" name="Gradle: org.apache.maven:maven-profile:2.2.1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: nekohtml:nekohtml:1.9.6.2@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: xpp3:xpp3_min:1.1.4c@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/mw/Projekte/Java/ldap_sync_2.0_as/app/libs/unboundid-ldapsdk-me.jar:unspecified@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: nekohtml:xercesMinimal:1.9.6.2@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.apache.maven:maven-model:2.2.1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.robolectric:utils:3.8@jar" level="project" />
@@ -151,6 +140,7 @@
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:20.0@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.robolectric:resources:3.8@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.unboundid:unboundid-ldapsdk:3.2.1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.robolectric:junit:3.8@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.almworks.sqlite4java:sqlite4java:0.282@jar" level="project" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "28.0.2"
 
     defaultConfig {
-        applicationId "de.danielweisser.android.ldapsync"
+        applicationId "de.wikilab.android.ldapsync"
         minSdkVersion 11
         targetSdkVersion 22
         compileOptions {
@@ -28,7 +28,8 @@ android {
 }
 
 dependencies {
-    implementation files('libs/unboundid-ldapsdk-me.jar')
+    // https://mvnrepository.com/artifact/com.unboundid/unboundid-ldapsdk
+    implementation group: 'com.unboundid', name: 'unboundid-ldapsdk', version: '3.2.1'
     implementation 'junit:junit:4.12'
     testImplementation "org.robolectric:robolectric:3.8"
 }
diff --git a/app/libs/unboundid-ldapsdk-me.jar b/app/libs/unboundid-ldapsdk-me.jar
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.danielweisser.android.ldapsync"
-    android:versionCode="14"
-    android:versionName="2.1" android:installLocation="internalOnly">
+    package="de.wikilab.android.ldapsync"
+    android:versionCode="15"
+    android:versionName="2.1.1" android:installLocation="internalOnly">
 
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -23,7 +23,7 @@
         android:label="@string/app_name"
         android:theme="@style/LightThemeSelector" >
         <service
-            android:name=".authenticator.LDAPAuthenticationService"
+            android:name="de.wikilab.android.ldapsync.authenticator.LDAPAuthenticationService"
             android:exported="true"
             android:permission="android.permission.MANAGE_ACCOUNTS" >
             <intent-filter>
@@ -35,7 +35,7 @@
                 android:resource="@xml/authenticator" />
         </service>
         <service
-            android:name=".syncadapter.SyncService"
+            android:name="de.wikilab.android.ldapsync.syncadapter.SyncService"
             android:exported="true"
             android:permission="android.permission.MANAGE_ACCOUNTS" >
             <intent-filter>
@@ -48,7 +48,7 @@
         </service>
 
         <activity
-            android:name=".authenticator.LDAPAuthenticatorActivity"
+            android:name="de.wikilab.android.ldapsync.authenticator.LDAPAuthenticatorActivity"
             android:excludeFromRecents="true"
             android:label="@string/ui_activity_title"
             android:windowSoftInputMode="stateVisible|adjustResize">
@@ -60,10 +60,10 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".authenticator.AccountSettingsActivity" >
+        <activity android:name="de.wikilab.android.ldapsync.authenticator.AccountSettingsActivity" >
         </activity>
 
-        <activity android:name=".authenticator.AccountsListActivity" >
+        <activity android:name="de.wikilab.android.ldapsync.authenticator.AccountsListActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -85,7 +85,7 @@
             </intent-filter>
         </activity>
         -->
-        <activity android:name=".activity.SyncErrorActivity"
+        <activity android:name="de.wikilab.android.ldapsync.activity.SyncErrorActivity"
             android:label="UF Phonebook Sync Error"
             android:launchMode="singleTask"
             android:taskAffinity=""

diff --git a/...elweisser/android/ldapsync/Constants.java → ...e/wikilab/android/ldapsync/Constants.java b/...elweisser/android/ldapsync/Constants.java → ...e/wikilab/android/ldapsync/Constants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.danielweisser.android.ldapsync;
+package de.wikilab.android.ldapsync;
 
 /**
  * Constants for the LDAP sync adapter.
@@ -26,7 +26,7 @@ public class Constants {
 	/**
 	 * Account type string.
 	 */
-	public static final String ACCOUNT_TYPE = "de.danielweisser.android.ldapsync";
+	public static final String ACCOUNT_TYPE = "de.wikilab.android.ldapsync";
 
 	/**
 	 * SD card LDAPSync folder.

diff --git a/.../danielweisser/android/ldapsync/Util.java → ...ava/de/wikilab/android/ldapsync/Util.java b/.../danielweisser/android/ldapsync/Util.java → ...ava/de/wikilab/android/ldapsync/Util.java
@@ -1,4 +1,4 @@
-package de.danielweisser.android.ldapsync;
+package de.wikilab.android.ldapsync;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

diff --git a/...id/ldapsync/activity/ProfileActivity.java → ...id/ldapsync/activity/ProfileActivity.java b/...id/ldapsync/activity/ProfileActivity.java → ...id/ldapsync/activity/ProfileActivity.java
@@ -1,30 +1,7 @@
-package de.danielweisser.android.ldapsync.activity;
+package de.wikilab.android.ldapsync.activity;
 
-import de.danielweisser.android.ldapsync.R;
-import de.danielweisser.android.ldapsync.Constants;
-import de.danielweisser.android.ldapsync.client.Address;
-import de.danielweisser.android.ldapsync.client.Contact;
-//import de.danielweisser.android.ldapsync.client.Organization;
-import de.danielweisser.android.ldapsync.platform.ContactManager;
-import de.danielweisser.android.ldapsync.syncadapter.Logger;
+//import de.wikilab.android.ldapsync.client.Organization;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds;
-import android.provider.ContactsContract.Intents.Insert;
-import android.text.util.Linkify;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
 /*
 public class ProfileActivity extends Activity implements OnClickListener {
 

diff --git a/.../ldapsync/activity/SyncErrorActivity.java → .../ldapsync/activity/SyncErrorActivity.java b/.../ldapsync/activity/SyncErrorActivity.java → .../ldapsync/activity/SyncErrorActivity.java
@@ -1,7 +1,7 @@
-package de.danielweisser.android.ldapsync.activity;
+package de.wikilab.android.ldapsync.activity;
 
-import de.danielweisser.android.ldapsync.R;
-import de.danielweisser.android.ldapsync.Util;
+import de.wikilab.android.ldapsync.R;
+import de.wikilab.android.ldapsync.Util;
 
 import android.app.Activity;
 import android.content.Intent;