DecentralizedAmateurPagingNetwork · burakozhan · Jan 18, 2023 · Jan 18, 2023 · Jan 18, 2023 · Jan 18, 2023
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,27 +1,24 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.2'
+    compileSdkVersion 33
     defaultConfig {
         applicationId "de.hampager.dapnetmobile"
-        minSdkVersion 15
-        targetSdkVersion 27
+        minSdkVersion 21
+        targetSdkVersion 33
         versionCode 25
         versionName "1.2.1"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
             shrinkResources false
             minifyEnabled false
-            useProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
         }
         debug {
             minifyEnabled false
-            useProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
         }
@@ -37,17 +34,16 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'org.osmdroid:osmdroid-android:6.0.2'
     implementation 'com.github.MKergall:osmbonuspack:6.5.2'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
     implementation 'com.splitwise:tokenautocomplete:2.0.8@aar'
-    //implementation "com.splitwise:tokenautocomplete:3.0.1@aar"
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.github.DecentralizedAmateurPagingNetwork:DAP4J:1.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
-}
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,8 @@
         android:screenOrientation="portrait"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.NoActionBar">
-        <activity android:name=".activites.SplashActivity">
+        <activity android:name=".activites.SplashActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -31,7 +32,8 @@
         <activity
             android:name=".activites.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -46,7 +48,8 @@
         <activity
             android:name=".activites.LoginActivity"
             android:label="@string/title_activity_login"
-            android:parentActivityName=".activites.MainActivity">
+            android:parentActivityName=".activites.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>

diff --git a/app/src/main/java/de/hampager/dapnetmobile/DAPNETApp.java b/app/src/main/java/de/hampager/dapnetmobile/DAPNETApp.java
@@ -4,21 +4,13 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.squareup.leakcanary.LeakCanary;
-
 import de.hampager.dap4j.DapnetSingleton;
 
 public class DAPNETApp extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return;
-        }
-        //LeakCanary.install(this);
-        // Normal app init code...
+
         SharedPreferences sharedPref = getSharedPreferences("sharedPref", Context.MODE_PRIVATE);
         String url = sharedPref.getString("server", getResources().getString(R.string.ClearNetURL));
         String user = sharedPref.getString("user", "");

diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/LoginActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/LoginActivity.java
@@ -8,9 +8,9 @@
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.design.widget.TextInputEditText;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.textfield.TextInputEditText;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Patterns;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/MainActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/MainActivity.java
@@ -6,15 +6,15 @@
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.NavigationView;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-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 androidx.annotation.NonNull;
+import com.google.android.material.navigation.NavigationView;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.Fragment;
+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.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/PostCallActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/PostCallActivity.java
@@ -4,20 +4,18 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.design.widget.TextInputEditText;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.textfield.TextInputEditText;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.InputType;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/PrivacyActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/PrivacyActivity.java
@@ -4,8 +4,8 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/SplashActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/SplashActivity.java
@@ -3,15 +3,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 import java.util.Timer;
 import java.util.TimerTask;
 
 import de.hampager.dapnetmobile.R;
-import de.hampager.dapnetmobile.fragments.PrivacyFragment;
-import de.hampager.dapnetmobile.fragments.WelcomeFragment;
 
 /**
  * SplashActivity : displays app logo upon startup.

diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/CallAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/CallAdapter.java
@@ -1,8 +1,8 @@
 package de.hampager.dapnetmobile.adapters;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/NodeAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/NodeAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricContentAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricContentAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/StatsAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/StatsAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/SubscriberAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/SubscriberAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterGroupAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterGroupAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/UserAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/UserAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/CallFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/CallFragment.java
@@ -3,13 +3,13 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.core.view.MenuItemCompat;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.SearchView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/HelpFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/HelpFragment.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.text.Html;
 import android.util.Log;
 import android.view.LayoutInflater;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/MapFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/MapFragment.java
@@ -7,10 +7,10 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/PrivacyFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/PrivacyFragment.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/TableFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/TableFragment.java
@@ -2,13 +2,13 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.SearchView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;

diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/WelcomeFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/WelcomeFragment.java
@@ -3,15 +3,14 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.Fragment;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;